webbrowser-app

Merge lp:~abreu-alexandre/webbrowser-app/onnavigationrequested into lp:webbrowser-app

onnavigationrequested
Merge into trunk

Proposed by Alexandre Abreu on 2014-04-02

Status:

Merged

Merged at revision:

485

Proposed branch:

lp:~abreu-alexandre/webbrowser-app/onnavigationrequested

Merge into:

lp:webbrowser-app

Diff against target:

351 lines (+205/-98)

3 files modified

src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml (+20/-7)
src/app/webcontainer/WebViewImplOxide.qml (+179/-0)
src/app/webcontainer/WebappContainerWebview.qml (+6/-91)

To merge this branch:

bzr merge lp:~abreu-alexandre/webbrowser-app/onnavigationrequested

Related bugs:

Bug #1302769: Popup windows not working	Undecided	Fix Released
Bug #1304380: [webapp-container] [regression] External links don't open in the browser	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-09
Ubuntu Phablet Team		2014-04-02	Pending
Review via email: mp+213903@code.launchpad.net

Commit message

Add support for Oxide's onNavigationRequested in the container

Description of the change

Add support for Oxide's onNavigationRequested in the container
It also updates Oxide to 1.0 (pending release)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

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

review: Needs Fixing (continuous-integration)

lp:~abreu-alexandre/webbrowser-app/onnavigationrequested updated on 2014-04-03

480. By Olivier Tilloy on 2014-04-03: Re-enable javascript dialogs, now that they are available in oxide.
481. By PS Jenkins bot on 2014-04-03: Releasing 0.23+14.04.20140403-0ubuntu1

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-04:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-06:

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

review: Needs Fixing (continuous-integration)

lp:~abreu-alexandre/webbrowser-app/onnavigationrequested updated on 2014-04-08

482. By Olivier Tilloy on 2014-04-07: Update to oxide 1.0.
483. By PS Jenkins bot on 2014-04-07: Releasing 0.23+14.04.20140407.1-0ubuntu1
484. By Launchpad Translations on behalf of phablet-team on 2014-04-08: Launchpad automatic translations update.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

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

review: Needs Fixing (continuous-integration)

lp:~abreu-alexandre/webbrowser-app/onnavigationrequested updated on 2014-04-09

485. By Alexandre Abreu on 2014-04-08: d
486. By Alexandre Abreu on 2014-04-09: handle invalid navigation request from popup
487. By Alexandre Abreu on 2014-04-09: handle invalid 'about:blank' navigation as gracefully as possible until fixed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alexandre Abreu

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

 === modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml'
 --- src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-04-07 09:17:37 +0000
 +++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-04-09 01:25:24 +0000
@@ -26,7 +26,8 @@
  WebView {
      id: _webview
--    signal newTabRequested(url url)
++    // TODO Should be renamed to newViewRequested
++    signal newTabRequested(var request)
      //interactive: !selection.visible
@@ -96,11 +97,22 @@
+         }
+     ]
--    /*onNavigationRequested: {
--        request.action = WebView.AcceptRequest;
--
--        navigationRequestedDelegate (request);
--        if (request.action === WebView.IgnoreRequest)
++    onNewViewRequested: {
++        // TODO: at this point request.disposition should be
++        // NewViewRequest.DispositionNewPopup (all dispositions are coerced to it),
++        // not sure if it is safer to add an extra level of filtering to avoid
++        // e.g. NewViewRequest.DispositionCurrentTab being opened
++        // as new tabs (although should never happen)
++        newTabRequested(request)
++    }
++
++    onNavigationRequested: {
++        request.action = NavigationRequest.ActionAccept;
++
++        navigationRequestedDelegate(request);
++
++        /*
++        if (request.action === NavigationRequest.ActionReject)
              return;
          var staticUA = _webview.getUAString()
@@ -109,7 +121,8 @@
          } else {
              _webview.experimental.userAgent = staticUA
+         }
--    }*/
++        */
++    }
      /*experimental.preferences.navigatorQtObjectEnabled: true
      experimental.userScripts: [Qt.resolvedUrl("hyperlinks.js"),
 === added file 'src/app/webcontainer/WebViewImplOxide.qml'
 --- src/app/webcontainer/WebViewImplOxide.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webcontainer/WebViewImplOxide.qml	2014-04-09 01:25:24 +0000
@@ -0,0 +1,179 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import QtQuick.Window 2.0
++import com.canonical.Oxide 1.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.Extras.Browser 0.2
++import Ubuntu.UnityWebApps 0.1 as UnityWebApps
++import Ubuntu.Components.Popups 0.1
++import "../actions" as Actions
++import ".."
++
++WebViewImpl {
++    id: webview
++
++    property bool developerExtrasEnabled: false
++    property var toolbar: null
++    property string webappName: ""
++    property var webappUrlPatterns: null
++
++    currentWebview: webview
++
++    contextualActions: ActionList {
++        Actions.CopyLink {
++            enabled: webview.contextualData.href.toString()
++            onTriggered: Clipboard.push([webview.contextualData.href])
++        }
++        Actions.CopyImage {
++            enabled: webview.contextualData.img.toString()
++            onTriggered: Clipboard.push([webview.contextualData.img])
++        }
++    }
++
++    function isRunningAsANamedWebapp() {
++        return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
++    }
++
++    function haveValidUrlPatterns() {
++        return webappUrlPatterns && webappUrlPatterns.length !== 0
++    }
++
++    function shouldAllowNavigationTo(url) {
++        // The list of url patterns defined by the webapp takes precedence over command line
++        if (isRunningAsANamedWebapp()) {
++            if (unityWebapps.model.exists(unityWebapps.name) &&
++                unityWebapps.model.doesUrlMatchesWebapp(unityWebapps.name, url)) {
++                return true;
++            }
++        }
++
++        // We still take the possible additional patterns specified in the command line
++        // (the in the case of finer grained ones specifically for the container and not
++        // as an 'install source' for the webapp).
++        if (webappUrlPatterns && webappUrlPatterns.length !== 0) {
++            for (var i = 0; i < webappUrlPatterns.length; ++i) {
++                var pattern = webappUrlPatterns[i]
++                if (url.match(pattern)) {
++                    return true;
++                }
++            }
++        }
++
++        return false;
++    }
++
++    function navigationRequestedDelegate(request) {
++        // Pass-through if we are not running as a named webapp (--webapp='Gmail')
++        // or if we dont have a list of url patterns specified to filter the
++        // browsing actions
++        if ( ! webview.haveValidUrlPatterns() && ! webview.isRunningAsANamedWebapp()) {
++            request.action = NavigationRequest.ActionAccept
++            return
++        }
++
++        var url = request.url.toString()
++
++        // Covers some edge cases corresponding to current Oxide potential issues (to be
++        // confirmed) that for e.g GooglePlus when a window.open() happens (or equivalent)
++        // the url that we are given (for the corresponding window.open() is 'about:blank')
++        if (url == 'about:blank') {
++            console.log('Ignoring the request to navigate to "about:blank"')
++            request.action = NavigationRequest.ActionReject
++            return;
++        }
++
++        request.action = NavigationRequest.ActionReject
++        if (webview.shouldAllowNavigationTo(url))
++            request.action = NavigationRequest.ActionAccept
++
++        if ( ! webview.isRunningAsANamedWebapp() && request.disposition === NavigationRequest.DispositionNewPopup) {
++            console.debug('Opening: popup window ' + url + ' in the browser window.')
++            Qt.openUrlExternally(url);
++            return;
++        }
++
++        if (request.action === NavigationRequest.ActionReject) {
++            console.debug('Opening: ' + url + ' in the browser window.')
++            Qt.openUrlExternally(url)
++        }
++    }
++
++    function createPopupWindow(request) {
++        popupWebViewFactory.createObject(webview, { request: request, width: 500, height: 800 });
++    }
++
++    Component {
++        id: popupWebViewFactory
++        Window {
++            id: popup
++            property alias request: popupBrowser.request
++            UbuntuWebView {
++                id: popupBrowser
++                anchors.fill: parent
++
++                function navigationRequestedDelegate(request) {
++                    var url = request.url.toString()
++
++                    // If we are to browse in the popup to a place where we are not allows
++                    if (request.disposition !== NavigationRequest.DispositionNewPopup &&
++                            ! webview.shouldAllowNavigationTo(url)) {
++                        Qt.openUrlExternally(url);
++                        popup.close()
++                        return;
++                    }
++
++                    // Fallback to regulat checks (there is a bit of overlap)
++                    webview.navigationRequestedDelegate(request)
++                }
++
++                onNewTabRequested: {
++                    webview.createPopupWindow(request)
++                }
++            }
++            Component.onCompleted: popup.show()
++        }
++    }
++
++    onNewTabRequested: {
++        createPopupWindow(request)
++    }
++
++    preferences.localStorageEnabled: true
++
++    // Small shim needed when running as a webapp to wire-up connections
++    // with the webview (message received, etc…).
++    // This is being called (and expected) internally by the webapps
++    // component as a way to bind to a webview lookalike without
++    // reaching out directly to its internals (see it as an interface).
++    function getUnityWebappsProxies() {
++        var eventHandlers = {
++            onAppRaised: function () {
++                if (webbrowserWindow) {
++                    try {
++                        webbrowserWindow.raise();
++                    } catch (e) {
++                        console.debug('Error while raising: ' + e);
++                    }
++                }
++            }
++        };
++        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)
++    }
++}
 === modified file 'src/app/webcontainer/WebappContainerWebview.qml'
 --- src/app/webcontainer/WebappContainerWebview.qml	2014-03-28 15:42:34 +0000
 +++ src/app/webcontainer/WebappContainerWebview.qml	2014-04-09 01:25:24 +0000
@@ -32,7 +32,7 @@
      property string webappName: ""
      property var currentWebview: webappContainerWebViewLoader.item
      property var toolbar: null
--    property var webappUrlPatterns: null
++    property var webappUrlPatterns
      Loader {
          id: webappContainerWebViewLoader
@@ -55,97 +55,12 @@
      Component {
          id: webappContainerWebViewOxide
--        WebViewImpl {
--            id: webview
--
++        WebViewImplOxide {
++            toolbar: containerWebview.toolbar
              url: containerWebview.url
--            currentWebview: webview
--            toolbar: containerWebview.toolbar
--
--            contextualActions: ActionList {
--                Actions.CopyLink {
--                    enabled: webview.contextualData.href.toString()
--                    onTriggered: Clipboard.push([webview.contextualData.href])
--                }
--                Actions.CopyImage {
--                    enabled: webview.contextualData.img.toString()
--                    onTriggered: Clipboard.push([webview.contextualData.img])
--                }
--            }
--
--            function haveValidUrlPatterns() {
--                return webappUrlPatterns && webappUrlPatterns.length !== 0
--            }
--
--            /*function navigationRequestedDelegate(request) {
--                if (!request.isMainFrame) {
--                    request.action = WebView.AcceptRequest
--                    return
--                }
--
--                // Pass-through if we are not running as a named webapp (--webapp='Gmail')
--                // or if we dont have a list of url patterns specified to filter the
--                // browsing actions
--                if ( ! haveValidUrlPatterns() && ! isRunningAsANamedWebapp()) {
--                    request.action = WebView.AcceptRequest
--                    return
--                }
--
--                var action = WebView.IgnoreRequest
--                var url = request.url.toString()
--
--                // The list of url patterns defined by the webapp takes precedence over command line
--                if (isRunningAsANamedWebapp()) {
--                    if (unityWebapps.model.exists(unityWebapps.name) &&
--                        unityWebapps.model.doesUrlMatchesWebapp(unityWebapps.name, url)) {
--                        request.action = WebView.AcceptRequest
--                        return;
--                    }
--                }
--
--                // We still take the possible additional patterns specified in the command line
--                // (the in the case of finer grained ones specifically for the container and not
--                // as an 'install source' for the webapp).
--                if (webappUrlPatterns && webappUrlPatterns.length !== 0) {
--                    for (var i = 0; i < webappUrlPatterns.length; ++i) {
--                        var pattern = webappUrlPatterns[i]
--                        if (url.match(pattern)) {
--                            action = WebView.AcceptRequest
--                            break
--                        }
--                    }
--                }
--
--                request.action = action
--                if (action === WebView.IgnoreRequest) {
--                    console.debug('Opening: ' + url + ' in the browser window.')
--                    Qt.openUrlExternally(url)
--                }
--            }*/
--
--            onNewTabRequested: Qt.openUrlExternally(url)
--
--            preferences.localStorageEnabled: true
--
--            // Small shim needed when running as a webapp to wire-up connections
--            // with the webview (message received, etc…).
--            // This is being called (and expected) internally by the webapps
--            // component as a way to bind to a webview lookalike without
--            // reaching out directly to its internals (see it as an interface).
--            function getUnityWebappsProxies() {
--                var eventHandlers = {
--                    onAppRaised: function () {
--                        if (webbrowserWindow) {
--                            try {
--                                webbrowserWindow.raise();
--                            } catch (e) {
--                                console.debug('Error while raising: ' + e);
--                            }
--                        }
--                    }
--                };
--                return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)
--            }
++            webappName: containerWebview.webappName
++            webappUrlPatterns: containerWebview.webappUrlPatterns
++            developerExtrasEnabled: containerWebview.developerExtrasEnabled
+         }
+     }
+ }