Merge lp:~abreu-alexandre/webbrowser-app/with-oxide into lp:~osomon/webbrowser-app/with-oxide

Proposed by Alexandre Abreu on 2014-03-18
Status: Merged
Approved by: Olivier Tilloy on 2014-03-19
Approved revision: 476
Merged at revision: 487
Proposed branch: lp:~abreu-alexandre/webbrowser-app/with-oxide
Merge into: lp:~osomon/webbrowser-app/with-oxide
Diff against target: 29 lines (+3/-3)
1 file modified
src/app/webcontainer/WebApp.qml (+3/-3)
To merge this branch: bzr merge lp:~abreu-alexandre/webbrowser-app/with-oxide
Reviewer Review Type Date Requested Status
Olivier Tilloy 2014-03-18 Approve on 2014-03-19
Review via email: mp+211614@code.launchpad.net

Commit message

Container updates: Enable localstorage + some fixes

Description of the change

Container updates: Enable localstorage + some fixes

To post a comment you must log in.
Olivier Tilloy (osomon) wrote :

Do we need https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml/oxide-integration/+merge/211615 to land first as a prerequisite, or does the landing order not matter?

review: Needs Information
Alexandre Abreu (abreu-alexandre) wrote :

> Do we need https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml
> /oxide-integration/+merge/211615 to land first as a prerequisite, or does the
> landing order not matter?

Does not matter really there are no deps between the 2, but this fixes an issue further down the webapps chain where quite a few webapps use localStorage

Alexandre Abreu (abreu-alexandre) wrote :

> > Do we need https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml
> > /oxide-integration/+merge/211615 to land first as a prerequisite, or does
> the
> > landing order not matter?
>
> Does not matter really there are no deps between the 2, but this fixes an
> issue further down the webapps chain where quite a few webapps use
> localStorage

You are right indeed, I missed/forgot the makeProxiesForWebViewBindee part,
yes there is a landing deps on https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml
> /oxide-integration/+merge/211615

Olivier Tilloy (osomon) wrote :

Good. As long as the two MRs land together we should be fine. The change looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/webcontainer/WebApp.qml'
2--- src/app/webcontainer/WebApp.qml 2014-03-17 22:16:59 +0000
3+++ src/app/webcontainer/WebApp.qml 2014-03-18 19:48:53 +0000
4@@ -69,8 +69,6 @@
5 }
6 height: parent.height - osk.height
7
8- //experimental.preferences.developerExtrasEnabled: developerExtrasEnabled
9-
10 contextualActions: ActionList {
11 Actions.CopyLink {
12 enabled: webview.contextualData.href.toString()
13@@ -116,6 +114,8 @@
14
15 onNewTabRequested: Qt.openUrlExternally(url)
16
17+ preferences.localStorageEnabled: true
18+
19 // Small shim needed when running as a webapp to wire-up connections
20 // with the webview (message received, etc…).
21 // This is being called (and expected) internally by the webapps
22@@ -133,7 +133,7 @@
23 }
24 }
25 };
26- return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview, eventHandlers)
27+ return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)
28 }
29 }
30

Subscribers

People subscribed via source and target branches