unity-webapps-qml

Merge lp:~abreu-alexandre/unity-webapps-qml/guard-url-navigate-to into lp:unity-webapps-qml

  1. guard-url-navigate-to
  2. Merge into trunk
Proposed by Alexandre Abreu
Status: Merged
Approved by: David Barth
Approved revision: 133
Merged at revision: 134
Proposed branch: lp:~abreu-alexandre/unity-webapps-qml/guard-url-navigate-to
Merge into: lp:unity-webapps-qml
Diff against target: 14 lines (+3/-1)
1 file modified
src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js (+3/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/unity-webapps-qml/guard-url-navigate-to
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+237645@code.launchpad.net

Commit message

Add small guard before url navigation

Description of the change

Add small guard before url navigation

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

LGTM!

review: Approve
Revision history for this message
David Barth (dbarth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
2--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js 2014-07-18 13:43:55 +0000
3+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js 2014-10-08 17:18:04 +0000
4@@ -184,7 +184,9 @@
5 // inject common function
6
7 proxy.navigateTo = function(url) {
8- webViewId.url = url;
9+ if (url.length !== 0) {
10+ webViewId.url = url;
11+ }
12 };
13 // called from the UnityWebApps side
14 proxy.onAppRaised = function () {

Subscribers

People subscribed via source and target branches

to all changes: