Merge lp:~abreu-alexandre/unity-webapps-qml/content-hub-share-import into lp:unity-webapps-qml

[Alexandre Abreu]

Add support for share & import signals

Add support for share & import signals

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/127/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good to me, I tested onImportRequested and onShareRequested on mako, worked fine.

review: Approve

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-05-08 13:01:07 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-05-20 06:59:07 +0000
@@ -769,6 +769,20 @@
             });
         },
 
+        onImportRequested: function(callback) {
+            _contenthub.onImportRequested.connect(function(importTransfer) {
+                var wrapped = new ContentTransfer(importTransfer);
+                callback(wrapped.serialize());
+            });
+        },
+
+        onShareRequested: function(callback) {
+            _contenthub.shareRequested.connect(function(shareTransfer) {
+                var wrapped = new ContentTransfer(shareTransfer);
+                callback(wrapped.serialize());
+            });
+        },
+
         // Internal
 
         dispatchToObject: function(infos) {

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js	2014-03-18 13:59:36 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js	2014-05-20 06:59:07 +0000
@@ -836,6 +836,58 @@
                                [callback]);
         },
 
+        /**
+         * Sets a handler that is to be called when the current application is the
+         * target of an share request.
+         *
+         * @method onExportRequested
+         * @param callback {Function(ContentTransfer)} Function when one requests a resource to be shared.
+         *                                                          The corresponding ContentTransfer is provided as a parameter.
+         *
+         * @example
+
+            var api = external.getUnityObject(1.0);
+            var hub = api.ContentHub;
+
+            var transferState = hub.ContentTransfer.State;
+
+            function _shareRequested(transfer) {
+            };
+
+            hub.onShareRequested(_shareRequested);
+
+         */
+        onShareRequested: function(callback) {
+            backendBridge.call('ContentHub.onShareRequested',
+                               [callback]);
+        },
+
+        /**
+         * Sets a handler that is to be called when the current application is the
+         * target of an import request.
+         *
+         * @method onImportRequested
+         * @param callback {Function(ContentTransfer)} Function when one requests a resource to be imported.
+         *                                                          The corresponding ContentTransfer is provided as a parameter.
+         *
+         * @example
+
+            var api = external.getUnityObject(1.0);
+            var hub = api.ContentHub;
+
+            var transferState = hub.ContentTransfer.State;
+
+            function _importRequested(transfer) {
+            };
+
+            hub.onImportRequested(_importRequested);
+
+         */
+        onImportRequested: function(callback) {
+            backendBridge.call('ContentHub.onImportRequested',
+                               [callback]);
+        },
+
         api: {
 
             /**