1
=== modified file 'src/app/Browser.qml'
2
--- src/app/Browser.qml	2013-10-07 19:01:57 +0000
3
+++ src/app/Browser.qml	2013-10-10 13:54:54 +0000
4
@@ -495,23 +495,6 @@
5
495
        }
495
        }
6
496
    }
496
    }
7
497
497
8
498
    // Handle runtime requests to open urls as defined
9
499
    // by the freedesktop application dbus interface's open
10
500
    // method for DBUS application activation:
11
501
    // http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
12
502
    // The dispatch on the org.freedesktop.Application if is done per appId at the
13
503
    // url-dispatcher/upstart level.
14
504
    Connections {
15
505
        target: UriHandler
16
506
        onOpened: {
17
507
            if ( ! webapp) {
18
508
                for (var i = 0; i < uris.length; ++i) {
19
509
                    newTab(uris[i], i == uris.length - 1);
20
510
                }
21
511
            }
22
512
        }
23
513
    }
24
514
25
515
    function isRunningAsANamedWebapp() {
498
    function isRunningAsANamedWebapp() {
26
516
        return browser.webappName && typeof(browser.webappName) === 'string' && browser.webappName.length != 0
499
        return browser.webappName && typeof(browser.webappName) === 'string' && browser.webappName.length != 0
27
517
    }
500
    }
28
518
501
29
=== modified file 'src/app/webbrowser-app.cpp'
30
--- src/app/webbrowser-app.cpp	2013-09-25 15:33:02 +0000
31
+++ src/app/webbrowser-app.cpp	2013-10-10 13:54:54 +0000
32
@@ -136,6 +136,11 @@
33
136
    browser->setProperty("webapp", m_arguments->webapp());
136
    browser->setProperty("webapp", m_arguments->webapp());
34
137
    browser->setProperty("webappName", m_arguments->webappName());
137
    browser->setProperty("webappName", m_arguments->webappName());
35
138
138
36
139
    if ( ! m_arguments->webapp())
37
140
    {
38
141
        browser->setProperty("enableUriHandling", true);
39
142
    }
40
143
41
139
    CommandLineParser::ChromeElementFlags chromeFlags = m_arguments->chromeFlags();
144
    CommandLineParser::ChromeElementFlags chromeFlags = m_arguments->chromeFlags();
42
140
    if (chromeFlags != 0)
145
    if (chromeFlags != 0)
43
141
    {
146
    {
44
142
147
45
=== modified file 'src/app/webbrowser-app.qml'
46
--- src/app/webbrowser-app.qml	2013-09-24 21:46:50 +0000
47
+++ src/app/webbrowser-app.qml	2013-10-10 13:54:54 +0000
48
@@ -35,6 +35,8 @@
49
35
    property alias webappName: browser.webappName
35
    property alias webappName: browser.webappName
50
36
    property alias webappModelSearchPath: browser.webappModelSearchPath
36
    property alias webappModelSearchPath: browser.webappModelSearchPath
51
37
37
52
38
    property bool enableUriHandling: false
53
39
54
38
    contentOrientation: browser.screenOrientation
40
    contentOrientation: browser.screenOrientation
55
39
41
56
40
    width: 800
42
    width: 800
57
@@ -63,4 +65,20 @@
58
63
    function newTab(url, setCurrent) {
65
    function newTab(url, setCurrent) {
59
64
        return browser.newTab(url, setCurrent)
66
        return browser.newTab(url, setCurrent)
60
65
    }
67
    }
61
68
62
69
    // Handle runtime requests to open urls as defined
63
70
    // by the freedesktop application dbus interface's open
64
71
    // method for DBUS application activation:
65
72
    // http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
66
73
    // The dispatch on the org.freedesktop.Application if is done per appId at the
67
74
    // url-dispatcher/upstart level.
68
75
    Connections {
69
76
        target: enableUriHandling ? UriHandler : null
70
77
        onOpened: {
71
78
            for (var i = 0; i < uris.length; ++i) {
72
79
                newTab(uris[i], i == uris.length - 1);
73
80
            }
74
81
        }
75
82
    }
76
83
77
66
}
84
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2013-10-10
Olivier Tilloy		2013-10-09	Approve on 2013-10-10
Review via email: mp+190221@code.launchpad.net
1	=== modified file 'src/app/Browser.qml'
2	--- src/app/Browser.qml 2013-10-07 19:01:57 +0000
3	+++ src/app/Browser.qml 2013-10-10 13:54:54 +0000
4	@@ -495,23 +495,6 @@
5	495	}	495	}
6	496	}	496	}
7	497		497
8	498	// Handle runtime requests to open urls as defined
9	499	// by the freedesktop application dbus interface's open
10	500	// method for DBUS application activation:
11	501	// http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
12	502	// The dispatch on the org.freedesktop.Application if is done per appId at the
13	503	// url-dispatcher/upstart level.
14	504	Connections {
15	505	target: UriHandler
16	506	onOpened: {
17	507	if ( ! webapp) {
18	508	for (var i = 0; i < uris.length; ++i) {
19	509	newTab(uris[i], i == uris.length - 1);
20	510	}
21	511	}
22	512	}
23	513	}
24	514
25	515	function isRunningAsANamedWebapp() {	498	function isRunningAsANamedWebapp() {
26	516	return browser.webappName && typeof(browser.webappName) === 'string' && browser.webappName.length != 0	499	return browser.webappName && typeof(browser.webappName) === 'string' && browser.webappName.length != 0
27	517	}	500	}
28	518		501
29	=== modified file 'src/app/webbrowser-app.cpp'
30	--- src/app/webbrowser-app.cpp 2013-09-25 15:33:02 +0000
31	+++ src/app/webbrowser-app.cpp 2013-10-10 13:54:54 +0000
32	@@ -136,6 +136,11 @@
33	136	browser->setProperty("webapp", m_arguments->webapp());	136	browser->setProperty("webapp", m_arguments->webapp());
34	137	browser->setProperty("webappName", m_arguments->webappName());	137	browser->setProperty("webappName", m_arguments->webappName());
35	138		138
36			139	if ( ! m_arguments->webapp())
37			140	{
38			141	browser->setProperty("enableUriHandling", true);
39			142	}
40			143
41	139	CommandLineParser::ChromeElementFlags chromeFlags = m_arguments->chromeFlags();	144	CommandLineParser::ChromeElementFlags chromeFlags = m_arguments->chromeFlags();
42	140	if (chromeFlags != 0)	145	if (chromeFlags != 0)
43	141	{	146	{
44	142		147
45	=== modified file 'src/app/webbrowser-app.qml'
46	--- src/app/webbrowser-app.qml 2013-09-24 21:46:50 +0000
47	+++ src/app/webbrowser-app.qml 2013-10-10 13:54:54 +0000
48	@@ -35,6 +35,8 @@
49	35	property alias webappName: browser.webappName	35	property alias webappName: browser.webappName
50	36	property alias webappModelSearchPath: browser.webappModelSearchPath	36	property alias webappModelSearchPath: browser.webappModelSearchPath
51	37		37
52			38	property bool enableUriHandling: false
53			39
54	38	contentOrientation: browser.screenOrientation	40	contentOrientation: browser.screenOrientation
55	39		41
56	40	width: 800	42	width: 800
57	@@ -63,4 +65,20 @@
58	63	function newTab(url, setCurrent) {	65	function newTab(url, setCurrent) {
59	64	return browser.newTab(url, setCurrent)	66	return browser.newTab(url, setCurrent)
60	65	}	67	}
61			68
62			69	// Handle runtime requests to open urls as defined
63			70	// by the freedesktop application dbus interface's open
64			71	// method for DBUS application activation:
65			72	// http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
66			73	// The dispatch on the org.freedesktop.Application if is done per appId at the
67			74	// url-dispatcher/upstart level.
68			75	Connections {
69			76	target: enableUriHandling ? UriHandler : null
70			77	onOpened: {
71			78	for (var i = 0; i < uris.length; ++i) {
72			79	newTab(uris[i], i == uris.length - 1);
73			80	}
74			81	}
75			82	}
76			83
77	66	}	84	}