Merge lp:~osomon/webbrowser-app/open-blank-in-new-tab into lp:webbrowser-app

[Olivier Tilloy]

Open links with target="_blank" in a new tab.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1942

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

review: Approve (continuous-integration)

[lp:~osomon/webbrowser-app/open-blank-in-new-tab]

167. By Olivier Tilloy on 2013-06-07

Be more tolerant with invalid syntaxes:
do the correct thing if the target of the link is defined as "target="_blank"".

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/146/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1949

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

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

review: Approve

=== modified file 'src/Ubuntu/Browser/Browser.qml'
--- src/Ubuntu/Browser/Browser.qml	2013-06-06 09:25:48 +0000
+++ src/Ubuntu/Browser/Browser.qml	2013-06-07 10:56:24 +0000
@@ -275,6 +275,8 @@
                     historyModel.add(webview.url, webview.title, webview.icon)
                 }
             }
+
+            onNewTabRequested: browser.newTab(url, true)
         }
     }
 

=== modified file 'src/Ubuntu/Browser/UbuntuWebView.qml'
--- src/Ubuntu/Browser/UbuntuWebView.qml	2013-05-28 10:51:25 +0000
+++ src/Ubuntu/Browser/UbuntuWebView.qml	2013-06-07 10:56:24 +0000
@@ -26,6 +26,8 @@
 WebView {
     id: _webview
 
+    signal newTabRequested(url url)
+
     QtObject {
         // clumsy way of defining an enum in QML
         id: formFactor
@@ -97,6 +99,8 @@
                 }
                 selection.show(data.left * scale, data.top * scale,
                                data.width * scale, data.height * scale)
+            } else if (data.event === 'newtab') {
+                newTabRequested(data.url)
             }
         }
     }

=== modified file 'src/Ubuntu/Browser/hyperlinks.js'
--- src/Ubuntu/Browser/hyperlinks.js	2013-02-22 15:29:02 +0000
+++ src/Ubuntu/Browser/hyperlinks.js	2013-06-07 10:56:24 +0000
@@ -28,8 +28,10 @@
             //    https://bugs.webkit.org/show_bug.cgi?id=76416
             //    https://bugs.webkit.org/show_bug.cgi?id=91779
             if (node.hasAttribute('target')) {
-                if (node.getAttribute('target').toLowerCase() == '_blank') {
-                    window.location = node.getAttribute('href');
+                var target = node.getAttribute('target').toLowerCase();
+                if ((target == '_blank') || (target == '"_blank"')) {
+                    var link = {'event': 'newtab', 'url': node.getAttribute('href')};
+                    navigator.qt.postMessage(JSON.stringify(link));
                 }
             }
             break;

=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2013-06-06 09:25:48 +0000
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2013-06-07 10:56:24 +0000
@@ -139,3 +139,21 @@
         self.assert_chrome_eventually_shown()
         address_bar = self.main_window.get_address_bar()
         self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+
+    def test_open_target_blank_in_new_tab(self):
+        # craft a page that accepts clicks anywhere inside its window
+        # and that requests opening another page in a new tab
+        url2 = self.base_url + "/aleaiactaest"
+        html = '<html><body style="margin: 0">'
+        html += '<a href="%s" target="_blank">' % url2
+        html += '<div style="height: 100%"></div></a></body></html>'
+        url = self.make_raw_html_page(html)
+        self.go_to_url(url)
+        self.assert_page_eventually_loaded(url)
+        webview = self.main_window.get_current_webview()
+        self.pointing_device.move_to_object(webview)
+        self.pointing_device.click()
+        listview = self.main_window.get_tabslist_listview()
+        self.assertThat(listview.count, Eventually(Equals(2)))
+        self.assertThat(listview.currentIndex, Eventually(Equals(1)))
+        self.assert_current_url(url2)