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
311
    }
311
    }
6
312
312
7
313
    Loader {
313
    Loader {
8
314
        id: webappsComponentLoader
9
314
        sourceComponent: (browser.webapp && tabsModel.currentIndex > -1) ? webappsComponent : undefined
315
        sourceComponent: (browser.webapp && tabsModel.currentIndex > -1) ? webappsComponent : undefined
10
315
316
11
316
        Component {
317
        Component {
12
317
            id: webappsComponent
318
            id: webappsComponent
13
318
319
14
319
            UnityWebApps.UnityWebApps {
320
            UnityWebApps.UnityWebApps {
15
320
                id: webapps
16
321
                name: browser.webappName
321
                name: browser.webappName
17
322
                bindee: tabsModel.currentWebview
322
                bindee: tabsModel.currentWebview
18
323
                actionsContext: browser.actionManager.globalContext
323
                actionsContext: browser.actionManager.globalContext
19
@@ -423,8 +423,12 @@
20
423
                var url = request.url.toString();
423
                var url = request.url.toString();
21
424
424
22
425
                // The list of url patterns defined by the webapp takes precedence over command line
425
                // The list of url patterns defined by the webapp takes precedence over command line
25
426
                if (webapp && isRunningAsANamedWebapp() && webapps.model && webapps.model.exists(webapps.name)) {
426
                if (webapp && isRunningAsANamedWebapp()) {
26
427
                    if ( ! webapps.model.doesUrlMatchesWebapp(webapps.name, url)) {
427
                    var webappComponent = webappsComponentLoader.item;
27
428
28
429
                    if (webappComponent != null &&
29
430
                        webappComponent.model.exists(webappComponent.name) &&
30
431
                        ! webappComponent.model.doesUrlMatchesWebapp(webappComponent.name, url)) {
31
428
                        action = WebView.IgnoreRequest;
432
                        action = WebView.IgnoreRequest;
32
429
                    }
433
                    }
33
430
                }
434
                }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-09-27
Olivier Tilloy		2013-09-26	Approve on 2013-09-26
Review via email: mp+187638@code.launchpad.net