Merge lp:~michael-sheldon/webbrowser-app/fix-double-slash-image-urls into lp:webbrowser-app

[Michael Sheldon]

Resolve image URLs beginning with a double slash correctly for context menu items

Resolves image URLs beginning with a double slash correctly for context menu items (e.g. copying image URLs, opening images in new tabs, etc.).

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/webbrowser-app) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:503
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/768/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/270
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/270/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/270
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5181
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5181/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4610
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6454
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6302

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good, and fixes bug #1311626. Thanks Michael!

review: Approve

=== modified file 'src/Ubuntu/Components/Extras/Browser/selection01.js'
--- src/Ubuntu/Components/Extras/Browser/selection01.js	2014-03-12 14:39:34 +0000
+++ src/Ubuntu/Components/Extras/Browser/selection01.js	2014-04-23 12:36:57 +0000
@@ -40,7 +40,13 @@
             if (firstcolon !== -1) {
                 protocol = docuri.slice(0, firstcolon + 3);
             }
-            return protocol + document.domain + uri;
+            if (uri.slice(0, 2) === '//') {
+                // URLs beginning with a // should just inherit the protocol
+                // from the current page
+                return protocol + uri.slice(2);
+            } else {
+                return protocol + document.domain + uri;
+            }
         } else {
             var base = document.baseURI;
             var lastslash = base.lastIndexOf('/');
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/selection02.js'
--- src/Ubuntu/Components/Extras/Browser/selection02.js	2014-03-12 14:15:25 +0000
+++ src/Ubuntu/Components/Extras/Browser/selection02.js	2014-04-23 12:36:57 +0000
@@ -34,7 +34,13 @@
         if (firstcolon !== -1) {
             protocol = docuri.slice(0, firstcolon + 3);
         }
-        return protocol + document.domain + uri;
+        if (uri.slice(0, 2) === '//') {
+            // URLs beginning with a // should just inherit the protocol
+            // from the current page
+            return protocol + uri.slice(2);
+        } else {
+            return protocol + document.domain + uri;
+        }
     } else {
         var base = document.baseURI;
         var lastslash = base.lastIndexOf('/');