diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-07 17:20:52 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-07 17:20:52 +0800 |
| commit | d1a6084bf71d0cfff02e35062a0bbd7b20f304b7 (patch) | |
| tree | 1b855fe929a0fafb2e6108b34b16b20b3798b02e /mist/assets/qml/webapp.qml | |
| parent | bd95fd770be8e6a969513a8eaddd05f3ae47c9a3 (diff) | |
| parent | a9b857769dfd843b70563c5abd5727285ebc9608 (diff) | |
| download | go-tangerine-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar go-tangerine-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.gz go-tangerine-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.bz2 go-tangerine-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.lz go-tangerine-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.xz go-tangerine-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.zst go-tangerine-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.zip | |
Merge branch 'release/0.6.8'v0.6.8
Diffstat (limited to 'mist/assets/qml/webapp.qml')
| -rw-r--r-- | mist/assets/qml/webapp.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mist/assets/qml/webapp.qml b/mist/assets/qml/webapp.qml index dde298484..09e6a83ad 100644 --- a/mist/assets/qml/webapp.qml +++ b/mist/assets/qml/webapp.qml @@ -164,7 +164,7 @@ import "../ext/qml_messaging.js" as Messaging experimental.preferences.javascriptEnabled: true experimental.preferences.navigatorQtObjectEnabled: true experimental.preferences.developerExtrasEnabled: true - experimental.userScripts: ["../ext/q.js", "../ext/pre.js", "../ext/big.js", "../ext/string.js", "../ext/html_messaging.js"] + experimental.userScripts: ["../ext/qt_messaging_adapter.js", "../ext/q.js", "../ext/big.js", "../ext/string.js", "../ext/html_messaging.js"] experimental.onMessageReceived: { console.log("[onMessageReceived]: ", message.data) // TODO move to messaging.js |