Merge lp:~abreu-alexandre/unity-webapps-qml/backport-14-10 into lp:unity-webapps-qml/14.10

[Alexandre Abreu]

backport getpeers content hub fix
backport content hub issue on desktop webapp startup,
backport oxide integration fixes,

Unmerged revisions

135. By Alexandre Abreu on 2014-12-02

backport oxide integration

134. By Alexandre Abreu on 2014-12-02

backport desktop fix for content hub; backport getpeers fix

=== modified file 'debian/control'
--- debian/control	2014-10-14 10:02:49 +0000
+++ debian/control	2014-12-02 16:11:02 +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,
@@ -29,7 +28,7 @@
 Package: unity-webapps-qml
 Architecture: any
 Depends: qml-module-qtwebkit,
-         liboxideqt-qmlplugin (>= 1.0),
+         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-07-18 13:43:55 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-12-02 16:11:02 +0000
@@ -75,8 +75,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-07-18 21:46:57 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-12-02 16:11:02 +0000
@@ -112,6 +112,13 @@
      */
     property var model: 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 bool UnityWebApps::injectExtraUbuntuApis
@@ -237,6 +244,8 @@
 
         if (internal.backends)
             internal.instance.setBackends(internal.backends)
+
+        userScriptsInjected();
     }
 
     /*!
@@ -775,7 +784,8 @@
                 return AlarmApiBackend.createAlarmApi(UnityBackends.backendDelegate)
             }),
 
-            ContentHub: ContentHubApiBackend.createContentHubApi(UnityBackends.backendDelegate),
+            ContentHub: ContentHubApiBackend.createContentHubApi(
+                            UnityBackends.backendDelegate, webapps),
 
             RuntimeApi:  __injectResourceIfExtraApisAreEnabled(function() {
                 return RuntimeApiBackend.createRuntimeApi(UnityBackends.backendDelegate)

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-07-18 13:43:55 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-12-02 16:11:02 +0000
@@ -64,7 +64,7 @@
     this.disposer = disposer;
     this.makeSignalDisconnecter = makeSignalDisconnecter;
     this._userScriptInjected = false;
-    this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://UnityWebappsApi";
+    this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://main-world";
 }
 OxideWebviewAdapter.prototype = {
     injectUserScripts: function(userScriptUrls) {
@@ -81,8 +81,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));
         }
         this._userScriptInjected = true;

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-06-17 13:53:49 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-12-02 16:11:02 +0000
@@ -16,15 +16,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-.import Ubuntu.Content 0.1 as ContentHubBridge
-
 /**
  *
  * ContentHub API backend binding
  *
  */
 
-function createContentHubApi(backendDelegate, accessPolicy) {
+function createContentHubApi(backendDelegate, parent) {
+
+    var bridge = null
+    try {
+        bridge = Qt.createQmlObject(
+            'import QtQuick 2.0; import Ubuntu.Content 0.1 as ContentHubBridge; \
+            QtObject { property var hub: ContentHubBridge }', parent)
+    }
+    catch(e) { }
+
+    if (!bridge) {
+        console.log('Could not create ContentHub backend (does not appear to be installed)')
+        return {};
+    }
+
+    var ContentHubBridge = bridge.hub;
+
     var PLUGIN_URI = 'Ubuntu.Content';
     var VERSION = 0.1;
 
@@ -643,8 +657,7 @@
                 return;
             }
 
-            var statement = "import QtQuick 2.0; import Ubuntu.Content 0.1; ContentPeerModel {";
-            var filterParams = {};
+            var statement = "import QtQuick 2.0; import Ubuntu.Content 0.1; ContentPeerModel { ";
             if (filters.contentType) {
                 statement += " contentType: ContentType." + filters.contentType + ";";
             }
@@ -654,18 +667,14 @@
             statement += " }";
 
             var peerModel = Qt.createQmlObject(statement, backendDelegate.parent());
-            var onPeersFound = function() {
-                var peers = peerModel.peers;
+            var peers = peerModel.peers;
 
-                var wrappedPeers = [];
-                for (var i = 0; i < peers.length; ++i) {
-                    var wrappedPeer = new ContentPeer(peers[i]);
-                    wrappedPeers.push(wrappedPeer.serialize());
-                }
-                peerModel.onFindPeersCompleted.disconnect(onPeersFound);
-                callback(wrappedPeers);
-            };
-            peerModel.onFindPeersCompleted.connect(onPeersFound);
+            var wrappedPeers = [];
+            for (var i = 0; i < peers.length; ++i) {
+                var wrappedPeer = new ContentPeer(peers[i]);
+                wrappedPeers.push(wrappedPeer.serialize());
+            }
+            callback(wrappedPeers);
         },
 
         getStore: function(scope, callback) {
@@ -692,7 +701,6 @@
             }
 
             var statement = "import QtQuick 2.0; import Ubuntu.Content 0.1; ContentPeerPicker {";
-            var filterParams = {};
             if (filters.contentType) {
                 statement += " contentType: ContentType." + filters.contentType + "";
             }

=== 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-02 16:11:02 +0000
@@ -4,7 +4,7 @@
             navigator.qt.postMessage) {
         return new UnityQtWebkitBackendMessagingProxy();
     }
-    else if (window.oxide) {
+    else if (oxide) {
         return new UnityOxideBackendMessagingProxy();
     }
     return null;