Merge lp:~osomon/webbrowser-app/blacklist-selection into lp:webbrowser-app

[Olivier Tilloy]

Do not install the selection event handlers on certain domains known to interfere with touch events.

[Olivier Tilloy (osomon)]

• Are there any related MPs required for this MP to build/function as expected? 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, on Galaxy Nexus

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

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:451
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/603/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3272
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2941
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2941/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5345
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4010

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

review: Approve (continuous-integration)

[Chris Wayne (cwayne)]

I've just tested this and verified that it fixed the issue!

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[Gustavo Pichorim Boiko (boiko)]

As a formality before the MR enters the CI train, could the reviewer (in this case Chris) please go through the MP Review Checklist (https://wiki.ubuntu.com/Process/Merges/Checklists/system-apps) and answer the questions in a comment on the MR?

[Gustavo Pichorim Boiko (boiko)]

> As a formality before the MR enters the CI train, could the reviewer (in this
> case Chris) please go through the MP Review Checklist
> (https://wiki.ubuntu.com/Process/Merges/Checklists/system-apps) and answer the
> questions in a comment on the MR?

Oups, I just noticed it was not Chris who approved the MR, it was Alexandre, so if he could please go through that, it would be nice.

[Alexandre Abreu (abreu-alexandre)]

Did you perform an exploratory manual test run of the 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/<package-name>) on device or emulator? YES

Did CI run pass? If not, please explain why. YES

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut? YES

[lp:~osomon/webbrowser-app/blacklist-selection]

452. By Olivier Tilloy on 2014-02-19

Let the selection handler listen to 'touchcancel' events for completeness.

=== modified file 'src/Ubuntu/Components/Extras/Browser/selection.js'
--- src/Ubuntu/Components/Extras/Browser/selection.js	2013-10-10 12:02:43 +0000
+++ src/Ubuntu/Components/Extras/Browser/selection.js	2014-02-19 15:54:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,163 +16,178 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-function elementContainedInBox(element, box) {
-    var rect = element.getBoundingClientRect();
-    return ((box.left <= rect.left) && (box.right >= rect.right) &&
-            (box.top <= rect.top) && (box.bottom >= rect.bottom));
-}
-
-function getImgFullUri(uri) {
-    if ((uri.slice(0, 7) === 'http://') ||
-        (uri.slice(0, 8) === 'https://') ||
-        (uri.slice(0, 7) === 'file://')) {
-        return uri;
-    } else if (uri.slice(0, 1) === '/') {
-        var docuri = document.documentURI;
-        var firstcolon = docuri.indexOf('://');
-        var protocol = 'http://';
-        if (firstcolon !== -1) {
-            protocol = docuri.slice(0, firstcolon + 3);
-        }
-        return protocol + document.domain + uri;
-    } else {
-        var base = document.baseURI;
-        var lastslash = base.lastIndexOf('/');
-        if (lastslash === -1) {
-            return base + '/' + uri;
+// List of domains known to interfere with touch events listeners
+var blacklist = [
+    "m.8tracks.com", // http://pad.lv/1279903
+];
+if (blacklist.indexOf(document.domain) === -1) {
+
+    function elementContainedInBox(element, box) {
+        var rect = element.getBoundingClientRect();
+        return ((box.left <= rect.left) && (box.right >= rect.right) &&
+                (box.top <= rect.top) && (box.bottom >= rect.bottom));
+    }
+
+    function getImgFullUri(uri) {
+        if ((uri.slice(0, 7) === 'http://') ||
+            (uri.slice(0, 8) === 'https://') ||
+            (uri.slice(0, 7) === 'file://')) {
+            return uri;
+        } else if (uri.slice(0, 1) === '/') {
+            var docuri = document.documentURI;
+            var firstcolon = docuri.indexOf('://');
+            var protocol = 'http://';
+            if (firstcolon !== -1) {
+                protocol = docuri.slice(0, firstcolon + 3);
+            }
+            return protocol + document.domain + uri;
         } else {
-            return base.slice(0, lastslash + 1) + uri;
-        }
-    }
-}
-
-function getSelectedData(element) {
-    var node = element;
-    var data = new Object;
-
-    var nodeName = node.nodeName.toLowerCase();
-    if (nodeName === 'img') {
-        data.img = getImgFullUri(node.getAttribute('src'));
-    } else if (nodeName === 'a') {
-        data.href = node.href;
-        data.title = node.title;
-    }
-
-    // If the parent tag is a hyperlink, we want it too.
-    var parent = node.parentNode;
-    if ((nodeName !== 'a') && parent && (parent.nodeName.toLowerCase() === 'a')) {
-        data.href = parent.href;
-        data.title = parent.title;
-        node = parent;
-    }
-
-    var boundingRect = node.getBoundingClientRect();
-    data.left = boundingRect.left;
-    data.top = boundingRect.top;
-    data.width = boundingRect.width;
-    data.height = boundingRect.height;
-
-    node = node.cloneNode(true);
-    // filter out script nodes
-    var scripts = node.getElementsByTagName('script');
-    while (scripts.length > 0) {
-        var scriptNode = scripts[0];
-        if (scriptNode.parentNode) {
-            scriptNode.parentNode.removeChild(scriptNode);
-        }
-    }
-    data.html = node.outerHTML;
-    data.nodeName = node.nodeName.toLowerCase();
-    // FIXME: extract the text and images in the order they appear in the block,
-    // so that this order is respected when the data is pushed to the clipboard.
-    data.text = node.textContent;
-    var images = [];
-    var imgs = node.getElementsByTagName('img');
-    for (var i = 0; i < imgs.length; i++) {
-        images.push(getImgFullUri(imgs[i].getAttribute('src')));
-    }
-    if (images.length > 0) {
-        data.images = images;
-    }
-
-    return data;
-}
-
-function adjustSelection(selection) {
-    // FIXME: allow selecting two consecutive blocks, instead of
-    // interpolating to the containing block.
-    var centerX = (selection.left + selection.right) / 2;
-    var centerY = (selection.top + selection.bottom) / 2;
-    var element = document.elementFromPoint(centerX, centerY);
-    var parent = element;
-    while (elementContainedInBox(parent, selection)) {
-        parent = parent.parentNode;
-    }
-    element = parent;
-    return getSelectedData(element);
-}
-
-function distance(touch1, touch2) {
-    return Math.sqrt(Math.pow(touch2.clientX - touch1.clientX, 2) +
-                     Math.pow(touch2.clientY - touch1.clientY, 2));
-}
-
-navigator.qt.onmessage = function(message) {
-    var data = null;
-    try {
-        data = JSON.parse(message.data);
-    } catch (error) {
-        return;
-    }
-    if ('query' in data) {
-        if (data.query === 'adjustselection') {
-            var selection = adjustSelection(data);
-            selection.event = 'selectionadjusted';
-            navigator.qt.postMessage(JSON.stringify(selection));
-        }
-    }
-}
-
-var longpressObserver = -1;
-var currentTouch = null;
-var longpressDetected = false;
-
-function longPressDetected(x, y) {
-    longpressDetected = true;
-    var element = document.elementFromPoint(x, y);
-    var data = getSelectedData(element);
-    data.event = 'longpress';
-    navigator.qt.postMessage(JSON.stringify(data));
-}
-
-function clearLongpressTimeout() {
-    clearTimeout(longpressObserver);
-    longpressObserver = -1;
-    currentTouch = null;
-}
-
-var doc = document.documentElement;
-
-doc.addEventListener('touchstart', function(event) {
-    if (event.touches.length == 1) {
-        currentTouch = event.touches[0];
-        longpressObserver = setTimeout(longPressDetected, 800, currentTouch.clientX, currentTouch.clientY);
-    }
-});
-
-doc.addEventListener('touchend', function(event) {
-    if (longpressDetected) {
-        longpressDetected = false;
-        event.preventDefault();
-    }
-    clearLongpressTimeout();
-});
-
-doc.addEventListener('touchmove', function(event) {
-    if (!currentTouch) {
-        return;
-    } 
-    if ((event.changedTouches.length > 1) || (distance(event.changedTouches[0], currentTouch) > 3)) {
-        clearLongpressTimeout();
-    }
-});
+            var base = document.baseURI;
+            var lastslash = base.lastIndexOf('/');
+            if (lastslash === -1) {
+                return base + '/' + uri;
+            } else {
+                return base.slice(0, lastslash + 1) + uri;
+            }
+        }
+    }
+
+    function getSelectedData(element) {
+        var node = element;
+        var data = new Object;
+
+        var nodeName = node.nodeName.toLowerCase();
+        if (nodeName === 'img') {
+            data.img = getImgFullUri(node.getAttribute('src'));
+        } else if (nodeName === 'a') {
+            data.href = node.href;
+            data.title = node.title;
+        }
+
+        // If the parent tag is a hyperlink, we want it too.
+        var parent = node.parentNode;
+        if ((nodeName !== 'a') && parent && (parent.nodeName.toLowerCase() === 'a')) {
+            data.href = parent.href;
+            data.title = parent.title;
+            node = parent;
+        }
+
+        var boundingRect = node.getBoundingClientRect();
+        data.left = boundingRect.left;
+        data.top = boundingRect.top;
+        data.width = boundingRect.width;
+        data.height = boundingRect.height;
+
+        node = node.cloneNode(true);
+        // filter out script nodes
+        var scripts = node.getElementsByTagName('script');
+        while (scripts.length > 0) {
+            var scriptNode = scripts[0];
+            if (scriptNode.parentNode) {
+                scriptNode.parentNode.removeChild(scriptNode);
+            }
+        }
+        data.html = node.outerHTML;
+        data.nodeName = node.nodeName.toLowerCase();
+        // FIXME: extract the text and images in the order they appear in the block,
+        // so that this order is respected when the data is pushed to the clipboard.
+        data.text = node.textContent;
+        var images = [];
+        var imgs = node.getElementsByTagName('img');
+        for (var i = 0; i < imgs.length; i++) {
+            images.push(getImgFullUri(imgs[i].getAttribute('src')));
+        }
+        if (images.length > 0) {
+            data.images = images;
+        }
+
+        return data;
+    }
+
+    function adjustSelection(selection) {
+        // FIXME: allow selecting two consecutive blocks, instead of
+        // interpolating to the containing block.
+        var centerX = (selection.left + selection.right) / 2;
+        var centerY = (selection.top + selection.bottom) / 2;
+        var element = document.elementFromPoint(centerX, centerY);
+        var parent = element;
+        while (elementContainedInBox(parent, selection)) {
+            parent = parent.parentNode;
+        }
+        element = parent;
+        return getSelectedData(element);
+    }
+
+    function distance(touch1, touch2) {
+        return Math.sqrt(Math.pow(touch2.clientX - touch1.clientX, 2) +
+                         Math.pow(touch2.clientY - touch1.clientY, 2));
+    }
+
+    navigator.qt.onmessage = function(message) {
+        var data = null;
+        try {
+            data = JSON.parse(message.data);
+        } catch (error) {
+            return;
+        }
+        if ('query' in data) {
+            if (data.query === 'adjustselection') {
+                var selection = adjustSelection(data);
+                selection.event = 'selectionadjusted';
+                navigator.qt.postMessage(JSON.stringify(selection));
+            }
+        }
+    }
+
+    var longpressObserver = -1;
+    var currentTouch = null;
+    var longpressDetected = false;
+
+    function longPressDetected(x, y) {
+        longpressDetected = true;
+        var element = document.elementFromPoint(x, y);
+        var data = getSelectedData(element);
+        data.event = 'longpress';
+        navigator.qt.postMessage(JSON.stringify(data));
+    }
+
+    function clearLongpressTimeout() {
+        clearTimeout(longpressObserver);
+        longpressObserver = -1;
+        currentTouch = null;
+    }
+
+    var doc = document.documentElement;
+
+    doc.addEventListener('touchstart', function(event) {
+        if (event.touches.length == 1) {
+            currentTouch = event.touches[0];
+            longpressObserver = setTimeout(longPressDetected, 800, currentTouch.clientX, currentTouch.clientY);
+        }
+    });
+
+    doc.addEventListener('touchend', function(event) {
+        if (longpressDetected) {
+            longpressDetected = false;
+            event.preventDefault();
+        }
+        clearLongpressTimeout();
+    });
+
+    doc.addEventListener('touchmove', function(event) {
+        if (!currentTouch) {
+            return;
+        } 
+        if ((event.changedTouches.length > 1) || (distance(event.changedTouches[0], currentTouch) > 3)) {
+            clearLongpressTimeout();
+        }
+    });
+
+    doc.addEventListener('touchcancel', function(event) {
+        if (longpressDetected) {
+            longpressDetected = false;
+        }
+        clearLongpressTimeout();
+    });
+
+}