Merge lp:~osomon/webbrowser-app/unsimplify-url-on-focus into lp:webbrowser-app

[Olivier Tilloy]

Display the full URL when focusing the address bar.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1085
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1973/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/727
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/727
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/727/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/727
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2820
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3380
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21686

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1973/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1085
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1978/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/732
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/732
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2828
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3388
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21715

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1978/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good, approved :)

review: Approve

=== modified file 'src/app/webbrowser/AddressBar.qml'
--- src/app/webbrowser/AddressBar.qml	2015-06-19 17:32:38 +0000
+++ src/app/webbrowser/AddressBar.qml	2015-07-07 10:16:27 +0000
@@ -300,28 +300,32 @@
             }
         }
 
-        function updateUrlFromFocus() {
-            if (canSimplifyText)  {
-                if (addressbar.activeFocus) {
-                    text = actualUrl
-                } else if (!loading && actualUrl.toString()) {
-                    text = internal.simplifyUrl(actualUrl)
-                }
+        // has the URL in the address bar been simplified?
+        property bool simplified: false
+    }
+
+    onCanSimplifyTextChanged: {
+        if (canSimplifyText) {
+            if (!loading && actualUrl.toString()) {
+                text = internal.simplifyUrl(actualUrl)
+                internal.simplified = true
             }
+        } else if (internal.simplified) {
+            text = actualUrl
+            internal.simplified = false
         }
     }
 
-    onActiveFocusChanged: internal.updateUrlFromFocus()
-    onCanSimplifyTextChanged: internal.updateUrlFromFocus()
-
     onActualUrlChanged: {
-        if (!activeFocus || !actualUrl.toString()) {
+        if (canSimplifyText || !actualUrl.toString()) {
             text = internal.simplifyUrl(actualUrl)
+            internal.simplified = true
         }
     }
     onRequestedUrlChanged: {
-        if (!activeFocus) {
+        if (canSimplifyText) {
             text = internal.simplifyUrl(requestedUrl)
+            internal.simplified = true
         }
     }
 

=== modified file 'tests/unittests/qml/tst_AddressBar.qml'
--- tests/unittests/qml/tst_AddressBar.qml	2015-05-18 13:53:05 +0000
+++ tests/unittests/qml/tst_AddressBar.qml	2015-07-07 10:16:27 +0000
@@ -39,6 +39,8 @@
             height: parent.height / 2
 
             searchUrl: "http://www.ubuntu.com/search?q={searchTerms}"
+
+            canSimplifyText: !activeFocus
         }
 
         // only exists to steal focus from the address bar