summaryrefslogtreecommitdiffstats
path: root/src/javascriptinterface.cpp
diff options
context:
space:
mode:
authorJonathan Bauer2011-03-23 13:02:50 +0100
committerJonathan Bauer2011-03-23 13:02:50 +0100
commit739dd7bd3b6bb40aa2058f28e76a4b1ccc9ae86b (patch)
tree23fffa3d3a16c1a759f85fe43af484bfede07607 /src/javascriptinterface.cpp
parent... (diff)
parentcan read the serial out of /tmp/serial if this exists (diff)
downloadfbgui-739dd7bd3b6bb40aa2058f28e76a4b1ccc9ae86b.tar.gz
fbgui-739dd7bd3b6bb40aa2058f28e76a4b1ccc9ae86b.tar.xz
fbgui-739dd7bd3b6bb40aa2058f28e76a4b1ccc9ae86b.zip
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Diffstat (limited to 'src/javascriptinterface.cpp')
-rw-r--r--src/javascriptinterface.cpp29
1 files changed, 29 insertions, 0 deletions
diff --git a/src/javascriptinterface.cpp b/src/javascriptinterface.cpp
index 6b8fe9c..8261582 100644
--- a/src/javascriptinterface.cpp
+++ b/src/javascriptinterface.cpp
@@ -18,6 +18,7 @@ const QString JavascriptInterface::getSysInfo(const QString& info){
//-------------------------------------------------------------------------------------------------------
void JavascriptInterface::attachToDOM(){
_parent->addToJavaScriptWindowObject(QString("fbgui"), this);
+ loadJQuery();
}
//-------------------------------------------------------------------------------------------------------
void JavascriptInterface::notify(const QString& msg){
@@ -65,3 +66,31 @@ void JavascriptInterface::callbackOnDlQueueFinished(){
void JavascriptInterface::quit(){
emit quitFbgui();
}
+//-------------------------------------------------------------------------------------------------------
+void JavascriptInterface::loadJQuery(){
+
+ QString js;
+
+ QDir* qrcJSDir = new QDir(":/html/js/");
+ QFileInfoList fiList = qrcJSDir->entryInfoList();
+ QFileInfo fi;
+ foreach(fi, fiList)
+ {
+ if(fi.suffix() == "js")
+ {
+ qDebug()<< fi.fileName();
+ qxtLog->debug() << fi.fileName();
+ if(fi.fileName()=="test.js")
+ {
+ QFile file;
+ file.setFileName(":/" + fi.fileName());
+ file.open(QIODevice::ReadOnly);
+ js = file.readAll();
+ file.close();
+
+ _parent->evaluateJavaScript(js);
+ qDebug()<< "evaluated " + fi.fileName();
+ }
+ }
+ }
+}