Merge lp:~abreu-alexandre/cordova-ubuntu/expose-mainview into lp:cordova-ubuntu/2.8

[Alexandre Abreu]

Expose the main webview to allow external elements to bind to possibly it.

Expose the main webview to allow external elements to bind to possibly it.

[Robert Bruce Park (robru)]

How do I test this one? ;-)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-2.8-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-2.8-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-2.8-trusty-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cordova-ubuntu-2.8-ci/7/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'Cordovaqt/CordovaViewInternal.qml'
--- Cordovaqt/CordovaViewInternal.qml	2013-08-23 17:14:42 +0000
+++ Cordovaqt/CordovaViewInternal.qml	2014-01-28 19:21:13 +0000
@@ -13,6 +13,9 @@
     property string wwwDir
     property string splashscreenPath
     property string inappbrowserUrl
+
+    property var mainWebview
+
     function exec(plugin, func, args) {
         CordovaWrapper.execMethod(plugin, func, args);
     }
@@ -101,6 +104,8 @@
 
             Component.onCompleted: {
                 webView.url = cordova.mainUrl
+
+		root.mainWebview = webView;
             }
 
             onTitleChanged: {
 
=== modified file 'qml/CordovaView.qml.in'
--- qml/CordovaView.qml.in	2013-07-17 02:52:18 +0000
+++ qml/CordovaView.qml.in	2014-01-28 19:21:13 +0000
@@ -4,6 +4,7 @@
 Item {
     id: root
     property string wwwDir
+    property var mainWebview
 
     Cordova {
         id: cordova
@@ -16,10 +17,15 @@
     Loader {
         id: loader
         asynchronous: true
+
         visible: false
         anchors.fill: parent
+
         onLoaded: {
+	    root.mainWebview = loader.item.mainWebview
+
             cordova.parent = loader.item
+
             loader.item.completed.connect(function(){
                 loader.item.visible = true
                 loader.visible = true
 
=== modified file 'src/qmlplugin.h'
--- src/qmlplugin.h	2013-07-17 02:52:18 +0000
+++ src/qmlplugin.h	2014-01-28 19:21:13 +0000
@@ -22,6 +22,9 @@
     }
 
     void setWwwDir(const QString &www) {
+        if (www.trimmed().isEmpty()) {
+            return;
+        }
         assert(!m_cordova.data());
         m_cordova = QSharedPointer<Cordova>(new Cordova(QDir(www), this));
         m_wwwDir = www;