Merge lp:~abreu-alexandre/unity-webapps-qml/rtm-fix-local-script-handling into lp:unity-webapps-qml/rtm-14.09

[Alexandre Abreu]

When using a webapp-properties file for an unamed webapp the user script does not get injected.

When using a webapp-properties file for an unamed webapp the user script does not get injected.

=== modified file 'debian/control'
--- debian/control	2014-10-14 10:02:49 +0000
+++ debian/control	2015-01-16 16:14:22 +0000
@@ -29,7 +29,7 @@
 Package: unity-webapps-qml
 Architecture: any
 Depends: qml-module-qtwebkit,
-         liboxideqt-qmlplugin (>= 1.0),
+         liboxideqt-qmlplugin (>= 1.3.0),
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-unity-action-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-07-18 13:43:55 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2015-01-16 16:14:22 +0000
@@ -40,7 +40,6 @@
         this._injected_unity_api_path = injected_api_path;
         this._bindeeProxies = bindeeProxies;
         this._backends = null;
-        this._userscripts = [];
         this._accessPolicy = accessPolicy;
         this._callbackManager = UnityWebAppsUtils.makeCallbackManager();
 
@@ -50,16 +49,22 @@
     _UnityWebApps.prototype = {
 
         cleanup: function() {
-            if (this._bindeeProxies.cleanup && typeof(this._bindeeProxies.cleanup) == 'function')
+            if (this._bindeeProxies.cleanup
+                    && typeof(this._bindeeProxies.cleanup) == 'function') {
                 this._bindeeProxies.cleanup();
+            }
         },
 
         proxies: function() {
             return this._bindeeProxies;
         },
 
-        setUserScriptsToInject: function(userscripts) {
-            this._userscripts = userscripts;
+        injectWebappUserScripts: function(userscripts) {
+            if (this._bindeeProxies) {
+                this._bindeeProxies.injectUserScripts(
+                         userscripts.map(function(script) {
+                             return Qt.resolvedUrl(script); }));
+            }
         },
 
         setBackends: function(backends) {
@@ -75,25 +80,18 @@
             var cb = this._onMessageReceivedCallback.bind(self);
             self._bindeeProxies.messageReceivedConnect(cb);
 
-            cb = this._onLoadingStartedCallback.bind(self);
-            self._bindeeProxies.loadingStartedConnect(cb);
+            this._injectCoreBindingUserScripts();
         },
 
         /**
          * \internal
          *
          */
-        _onLoadingStartedCallback: function () {
-            var scripts = [this._injected_unity_api_path];
-            for(var i = 0; i < this._userscripts.length; ++i) {
-                scripts.push(Qt.resolvedUrl(this._userscripts[i]));
+        _injectCoreBindingUserScripts: function () {
+            if (this._bindeeProxies) {
+                this._bindeeProxies.injectUserScripts(
+                         [Qt.resolvedUrl(this._injected_unity_api_path)]);
             }
-
-            for (i = 0; i < scripts.length; ++i)
-                console.debug('Injecting webapps script[' + i + '] : '
-                              + scripts[i]);
-
-            this._bindeeProxies.injectUserScripts(scripts);
         },
 
         /**
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-07-18 21:46:57 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-01-16 16:14:22 +0000
@@ -231,7 +231,7 @@
                     __getPolicyForContent(settings),
                     customClientApiFileUrl && customClientApiFileUrl.length !== 0
                       ? customClientApiFileUrl
-                      : Qt.resolvedUrl('unity-webapps-api.js'));
+                      : 'unity-webapps-api.js');
 
         internal.instance = instance;
 
@@ -369,7 +369,7 @@
         if (__isValidWebAppForModel(name)) {
             if (internal.instance) {
                 var userScripts = __gatherWebAppUserscriptsIfAny(name);
-                internal.instance.setUserScriptsToInject(userScripts);
+                internal.instance.injectWebappUserScripts(userScripts);
             }
             __navigateToWebappHomepageInBindee(name);
         }
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-07-18 13:43:55 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2015-01-16 16:14:22 +0000
@@ -63,14 +63,12 @@
     this.webview = webview;
     this.disposer = disposer;
     this.makeSignalDisconnecter = makeSignalDisconnecter;
-    this._userScriptInjected = false;
     this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://UnityWebappsApi";
+    this._injectedUserScripts = [];
+    this._scriptMessageReceivedHandler = null;
 }
 OxideWebviewAdapter.prototype = {
     injectUserScripts: function(userScriptUrls) {
-        if (this._userScriptInjected)
-            return;
-
         var context = this.webview.context;
         if (!context) {
             console.error('No context found for the current Oxide webview. Cannot inject user scripts.');
@@ -78,18 +76,31 @@
         }
 
         for (var i = 0; i < userScriptUrls.length; ++i) {
-            var scriptStart = "import com.canonical.Oxide 1.0 as Oxide; Oxide.UserScript { context:";
+            var script = userScriptUrls[i];
+            if (this._injectedUserScripts.some(
+                        function(e) { return e === script; })) {
+                console.log('Skipping already injected script: ' + script)
+                continue;
+            }
+
+            var scriptStart = "import com.canonical.Oxide 1.0 as Oxide; Oxide.UserScript { ";
             var scriptEnd = "}";
-            var statement = scriptStart +
-                    '"' + this._WEBAPPS_USER_SCRIPT_CONTEXT + '"' +
-                    '; matchAllFrames: false; url: "' +  userScriptUrls[i] + '";' + scriptEnd;
-            context.addUserScript(Qt.createQmlObject(statement, this.webview));
+            var statement = scriptStart
+                    + 'context: "' +   this._WEBAPPS_USER_SCRIPT_CONTEXT + '";'
+                    + 'matchAllFrames: false;'
+                    + 'emulateGreasemonkey: true;'
+                    + 'url: "' + script + '";'
+                     + scriptEnd;
+            context.addUserScript(
+                        Qt.createQmlObject(statement, this.webview));
         }
-        this._userScriptInjected = true;
+        this._injectedUserScripts.push(script);
     },
     sendToPage: function (message) {
         this.webview.rootFrame.sendMessageNoReply(
-                 this._WEBAPPS_USER_SCRIPT_CONTEXT, "UnityWebappApi-Host-Message", JSON.parse(message));
+                 this._WEBAPPS_USER_SCRIPT_CONTEXT,
+                 "UnityWebappApi-Host-Message",
+                 JSON.parse(message));
     },
     loadingStartedConnect: function (onLoadingStarted) {
         function handler(loadEvent) {
@@ -102,17 +113,22 @@
         this.disposer.addDisposer(this.makeSignalDisconnecter(this.webview.loadingChanged, handler));
     },
     messageReceivedConnect: function (onMessageReceived) {
-        function handler(msg, frame) {
+        function _handler(msg, frame) {
             onMessageReceived(msg.args);
         }
-
-        var script = 'import com.canonical.Oxide 1.0 as Oxide; ' +
-                ' Oxide.ScriptMessageHandler { msgId: "UnityWebappApi-Message"; contexts: ["' +
-                this._WEBAPPS_USER_SCRIPT_CONTEXT +
-                '"]; ' +
-                '}';
-        var messageHandler = Qt.createQmlObject(script, this.webview);
-        messageHandler.callback = handler;
+        if ( ! this._scriptMessageReceivedHandler) {
+            var script = 'import com.canonical.Oxide 1.0 as Oxide; ' +
+            ' Oxide.ScriptMessageHandler { '
+                + 'msgId: "UnityWebappApi-Message"; '
+                + 'contexts: ["' + this._WEBAPPS_USER_SCRIPT_CONTEXT + '"]; ' +
+            '}';
+            this._scriptMessageReceivedHandler =
+                 Qt.createQmlObject(script, this.webview);
+        }
+        this._scriptMessageReceivedHandler.callback = _handler;
+    },
+    cleanupAdapterInternals: function() {
+        this._scriptMessageReceivedHandler.callback = function() {};
     }
 }
 
@@ -194,6 +210,11 @@
         // called from the UnityWebApps side
         proxy.cleanup = function() {
             disposer.disposeAndCleanupAll();
+
+            if (this.cleanupAdapterInternals
+                    && typeof(this.cleanupAdapterInternals) === "function") {
+                this.cleanupAdapterInternals();
+            }
         };
 
         return proxy;
 
=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-07-17 13:41:45 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2015-01-16 16:14:22 +0000
@@ -191,8 +191,6 @@
         QFileInfo manifestFileInfo =
                 installationDir.absolutePath() + QDir::separator() + manifestFileName;
         if ( ! manifestFileInfo.isFile()) {
-            qDebug() << "Skipping" << manifestFileName << "as a webapp definition search: "
-                     << manifestFileInfo.absoluteFilePath();
             continue;
         }