Merge lp:~abreu-alexandre/unity-webapps-qml/backportoxide-1404 into lp:unity-webapps-qml/14.04

[Alexandre Abreu]

=== modified file 'debian/control'
--- debian/control	2014-04-30 01:13:30 +0000
+++ debian/control	2014-12-01 14:06:58 +0000
@@ -8,7 +8,6 @@
                libnotify-dev,
 # depend on oxide so that we don't build for archs that we can't install on
                liboxideqtcore0,
-               libqt5webkit5-dev,
                libunity-action-qt1-dev,
                libunity-dev,
                pkg-config,
@@ -28,8 +27,7 @@
 
 Package: unity-webapps-qml
 Architecture: any
-Depends: libqt5webkit5-qmlwebkitplugin,
-         liboxideqt-qmlplugin (>= 1.0),
+Depends: liboxideqt-qmlplugin (>= 1.3.4),
          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-03-18 18:52:11 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-12-01 14:06:58 +0000
@@ -66,8 +66,7 @@
             var cb = this._onMessageReceivedCallback.bind(self);
             self._bindeeProxies.messageReceivedConnect(cb);
 
-            cb = this._onLoadingStartedCallback.bind(self);
-            self._bindeeProxies.loadingStartedConnect(cb);
+            this._onLoadingStartedCallback();
         },
 
         /**

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-03-26 15:52:46 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-12-01 14:06:58 +0000
@@ -134,6 +134,13 @@
      */
     property var actionsContext: null
 
+    /*!
+     \qmlsignal UnityWebApps::userScriptsInjected()
+
+     This signal is emitted when the component has completed its initialization and
+     the userscripts have been injected into the binded webview.
+     */
+    signal userScriptsInjected()
 
     /*!
       \qmlproperty string UnityWebApps::_opt_backendProxies
@@ -210,6 +217,8 @@
 
         internal.backends = backends;
         internal.instance = instance;
+
+        userScriptsInjected();
     }
 
     /*!

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-04-02 18:16:34 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-12-01 14:06:58 +0000
@@ -62,7 +62,7 @@
     this.webview = webview;
     this.disposer = disposer;
     this.makeSignalDisconnecter = makeSignalDisconnecter;
-    this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://UnityWebappsApi";
+    this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://main-world";
 }
 OxideWebviewAdapter.prototype = {
     injectUserScripts: function(userScriptUrls) {
@@ -72,8 +72,10 @@
             var scriptStart = "import com.canonical.Oxide 1.0 as Oxide; Oxide.UserScript { context:";
             var scriptEnd = "}";
             var statement = scriptStart +
-                    '"' + this._WEBAPPS_USER_SCRIPT_CONTEXT + '"' +
-                    '; matchAllFrames: false; url: "' +  userScriptUrls[i] + '";' + scriptEnd;
+                    '"' + this._WEBAPPS_USER_SCRIPT_CONTEXT
+                    + '"'
+                    + '; matchAllFrames: false;  emulateGreasemonkey: true; url: "'
+                    +  userScriptUrls[i] + '";' + scriptEnd;
             context.addUserScript(Qt.createQmlObject(statement, this.webview));
         }
     },

=== modified file 'src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js'
--- src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js	2014-03-28 13:21:47 +0000
+++ src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js	2014-12-01 14:06:58 +0000
@@ -4,7 +4,7 @@
             navigator.qt.postMessage) {
         return new UnityQtWebkitBackendMessagingProxy();
     }
-    else if (window.oxide) {
+    else if (oxide) {
         return new UnityOxideBackendMessagingProxy();
     }
     return null;