Merge lp:~abreu-alexandre/unity-webapps-qml/embedded-ui-api-parent-view-property into lp:unity-webapps-qml

[Alexandre Abreu]

Allow one to specify a parent for embedded uis being launched by webapps

Allow one to specify a parent for embedded uis being launched by webapps

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-wily-armhf-ci/3

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

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

LGTM.

review: Approve

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-07-10 17:58:08 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2016-02-26 19:27:49 +0000
@@ -152,6 +152,15 @@
     property var customBackendProxies: null
 
     /*!
+      \qmlproperty string [optional] UnityWebApps::embeddedUiComponentParent
+
+      Specifies a parent view for potential embedded ui components being created
+      by using api.launchEmbeddedUI
+
+     */
+    property var embeddedUiComponentParent: null
+
+    /*!
       \qmlproperty string UnityWebApps::_opt_clientApiFileUrl
 
       Used only for testing.
@@ -651,6 +660,11 @@
 
                 var uicomponent;
                 function onCreated() {
+                    if (uicomponent.status == Component.Error) {
+                        console.log("Error loading embedded ui component:", uicomponent.errorString())
+                        return
+                    }
+
                     var args = {}
                     for (var k in params) {
                         if (params.hasOwnProperty(k)) {
@@ -680,8 +694,8 @@
                     uiobject.onCompleted.connect(_onCompleted);
                 };
 
-                var uicomponent = Qt.createComponent(path + "/" + name + ".qml");
-                if (uicomponent.status === Component.Ready)
+                uicomponent = Qt.createComponent(path + "/" + name + ".qml");
+                if (uicomponent.status == Component.Ready)
                     onCreated()
                 else
                     uicomponent.statusChanged.connect(onCreated)

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js	2014-05-16 16:29:35 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js	2016-02-26 19:27:49 +0000
@@ -203,7 +203,13 @@
     },
 
     parentView: function() {
-        return this._parent ? this._parent.bindee : null;
+        if (! this._parent) {
+            return null
+        }
+        if (this._parent.embeddedUiComponentParent) {
+            return this._parent.embeddedUiComponentParent
+        }
+        return this._parent.bindee
     },
 
     isObjectProxyInfo: function(info) {