Merge lp:~abreu-alexandre/webbrowser-app/fix-navigation-filtering into lp:webbrowser-app

Proposed by Alexandre Abreu
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 343
Merged at revision: 350
Proposed branch: lp:~abreu-alexandre/webbrowser-app/fix-navigation-filtering
Merge into: lp:webbrowser-app
Diff against target: 33 lines (+7/-3)
1 file modified
src/app/Browser.qml (+7/-3)
To merge this branch: bzr merge lp:~abreu-alexandre/webbrowser-app/fix-navigation-filtering
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Olivier Tilloy Approve
Review via email: mp+187638@code.launchpad.net

Commit message

Fix issue w/ with invalid webapp component id/access when filtering urls

Description of the change

Fix issue w/ with invalid webapp component id/access when filtering urls

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/Browser.qml'
2--- src/app/Browser.qml 2013-09-24 11:59:49 +0000
3+++ src/app/Browser.qml 2013-09-26 02:31:47 +0000
4@@ -311,13 +311,13 @@
5 }
6
7 Loader {
8+ id: webappsComponentLoader
9 sourceComponent: (browser.webapp && tabsModel.currentIndex > -1) ? webappsComponent : undefined
10
11 Component {
12 id: webappsComponent
13
14 UnityWebApps.UnityWebApps {
15- id: webapps
16 name: browser.webappName
17 bindee: tabsModel.currentWebview
18 actionsContext: browser.actionManager.globalContext
19@@ -423,8 +423,12 @@
20 var url = request.url.toString();
21
22 // The list of url patterns defined by the webapp takes precedence over command line
23- if (webapp && isRunningAsANamedWebapp() && webapps.model && webapps.model.exists(webapps.name)) {
24- if ( ! webapps.model.doesUrlMatchesWebapp(webapps.name, url)) {
25+ if (webapp && isRunningAsANamedWebapp()) {
26+ var webappComponent = webappsComponentLoader.item;
27+
28+ if (webappComponent != null &&
29+ webappComponent.model.exists(webappComponent.name) &&
30+ ! webappComponent.model.doesUrlMatchesWebapp(webappComponent.name, url)) {
31 action = WebView.IgnoreRequest;
32 }
33 }

Subscribers

People subscribed via source and target branches

to status/vote changes: