Merge lp:~dobey/pay-service/addcard-page into lp:pay-service

[dobey]

Use new loadingStateChanged signal as new Ubuntu.Web breaks loadingChanged.

[lp:~dobey/pay-service/addcard-page]

123. By dobey on 2016-03-15

Only pop up a loading dialog if not already showing one.
Use the loadProgress value as a metric for whether the page is loading or not.

124. By dobey on 2016-03-15

Link another bug that is fixed by these changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:122
http://jenkins.qa.ubuntu.com/job/pay-service-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-armhf-ci/78/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/148/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dobey/pay-service/addcard-page]

125. By dobey on 2016-03-15

Fix typo.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/pay-service-ci/149/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-armhf-ci/79/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/149/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/pay-service-ci/150/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-armhf-ci/80/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-service-ci/150/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

the .loading --> .loadProgress!=100 change is sketchy though...

review: Approve

=== modified file 'pay-ui/app/payui.qml'
--- pay-ui/app/payui.qml	2016-03-15 20:39:18 +0000
+++ pay-ui/app/payui.qml	2016-03-15 20:39:18 +0000
@@ -51,7 +51,7 @@
 
     useDeprecatedToolbar: false
 
-    property bool loading: true
+    property bool loading: false
     property bool purchasing: false
     property bool recentLogin: false
     property bool cancellable: true
@@ -209,8 +209,10 @@
     }
 
     function showLoading() {
-        mainView.loading = true;
-        PopupUtils.open(loadingDialogContainer);
+        if (!mainView.loading) {
+            mainView.loading = true;
+            PopupUtils.open(loadingDialogContainer);
+        }
     }
 
     function hideLoading() {

=== modified file 'pay-ui/app/ui/UbuntuPurchaseWebkit.qml'
--- pay-ui/app/ui/UbuntuPurchaseWebkit.qml	2016-03-15 20:39:18 +0000
+++ pay-ui/app/ui/UbuntuPurchaseWebkit.qml	2016-03-15 20:39:18 +0000
@@ -86,8 +86,8 @@
         promptDialog: PromptDialog {}
         beforeUnloadDialog: BeforeUnloadDialog {}
 
-        onLoadingChanged: {
-            pageWebkit.loading(webView.loading);
+        onLoadingStateChanged: {
+            pageWebkit.loading(webView.loadProgress != 100);
         }
 
         onUrlChanged: {