lp:~abreu-alexandre/unity-webapps-qml/fix-local-script-handling

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity-webapps-qml at revision 143

PS Jenkins bot (community): Approve (continuous-integration) on 2015-01-09

WebApps: Pending requested 2015-01-09

Diff: 590 lines (+161/-85)

17 files modified

debian/control (+1/-1)
src/Ubuntu/UnityWebApps/UnityWebApps.js (+14/-15)
src/Ubuntu/UnityWebApps/UnityWebApps.qml (+2/-2)
src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js (+42/-24)
src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp (+0/-3)
tests/autopilot/data/all-in-same-folder/script.user.js (+3/-1)
tests/autopilot/data/all-in-same-folder/webapp-properties.json (+2/-2)
tests/autopilot/data/unity-webapps-normal/manifest.json (+6/-4)
tests/autopilot/data/unity-webapps-normal/script.user.js (+3/-1)
tests/autopilot/data/unity-webapps-with-altered-ua-string/manifest.json (+3/-3)
tests/autopilot/data/unity-webapps-with-altered-ua-string/script.user.js (+3/-1)
tests/autopilot/qml/FullWebViewApp.qml (+2/-1)
tests/autopilot/qml/WebviewBackendOxide.qml (+3/-2)
tests/autopilot/unity_webapps_qml/tests/__init__.py (+41/-11)
tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py (+27/-5)
tests/autopilot/unity_webapps_qml/tests/test_launcher.py (+9/-7)
tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py (+0/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1409051: When using a webapp-properties file for an unamed webapp the user script does not get injected

High

Fix Released

Link a bug report

Related blueprints

143. By Alexandre Abreu on 2015-01-08

Fix local script lookup and injection, fix AP tests

142. By PS Jenkins bot on 2014-12-02

Releasing 0.1+15.04.20141202-0ubuntu1

141. By Alexandre Abreu on 2014-12-02

The content hub has been updated with some changes that caused the getPeers() fonction to break on the HTML5 API side.
Approved by: PS Jenkins bot

140. By Alexandre Abreu on 2014-12-02

Make sure that the content hub bindings are fail safe since the content hub package is a suggests (which is fine since it is not there by default on desktop). Fixes: #1395524
Approved by: PS Jenkins bot, Alberto Mardegan

139. By PS Jenkins bot on 2014-11-26

Releasing 0.1+15.04.20141126.1-0ubuntu1

138. By Alexandre Abreu on 2014-11-26

Improve testability for the desktop webapp search path
Approved by: PS Jenkins bot, Alberto Mardegan

137. By PS Jenkins bot on 2014-11-22

Releasing 0.1+15.04.20141122-0ubuntu1

136. By Alexandre Abreu on 2014-11-22

Port qml bindings to oxide Fixes: #1374100

135. By PS Jenkins bot on 2014-11-03

Releasing 0.1+15.04.20141103.1-0ubuntu1

134. By Alexandre Abreu on 2014-11-03

Add small guard before url navigation Fixes: 1378437
Approved by: PS Jenkins bot, David Barth, Alberto Mardegan