Merge lp:~mardy/ubuntu-system-settings-online-accounts/loading-1544063 into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 329
Merged at revision: 333
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/loading-1544063
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 19 lines (+2/-2)
1 file modified
plugins/module/WebView.qml (+2/-2)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/loading-1544063
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+285842@code.launchpad.net

Commit message

Don't use deprecated onLoadingChanged signal.

Description of the change

Don't use deprecated onLoadingChanged signal.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Tried and works fine.

review: Approve
330. By Alberto Mardegan

Don't emit failse positives on failures

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/module/WebView.qml'
--- plugins/module/WebView.qml 2015-11-02 07:28:44 +0000
+++ plugins/module/WebView.qml 2016-02-24 10:29:54 +0000
@@ -12,13 +12,13 @@
12 url = signonRequest.startUrl12 url = signonRequest.startUrl
13 }13 }
1414
15 onLoadingChanged: {15 onLoadingStateChanged: {
16 console.log("Loading changed")16 console.log("Loading changed")
17 if (loading && !lastLoadFailed) {17 if (loading && !lastLoadFailed) {
18 signonRequest.onLoadStarted()18 signonRequest.onLoadStarted()
19 } else if (lastLoadSucceeded) {19 } else if (lastLoadSucceeded) {
20 signonRequest.onLoadFinished(true)20 signonRequest.onLoadFinished(true)
21 } else {21 } else if (lastLoadFailed) {
22 signonRequest.onLoadFinished(false)22 signonRequest.onLoadFinished(false)
23 }23 }
24 }24 }

Subscribers

People subscribed via source and target branches