Merge lp://staging/~abreu-alexandre/unity-webapps-qml/fix-content-hub-export into lp://staging/unity-webapps-qml

Proposed by Alexandre Abreu
Status: Merged
Approved by: Kyle Nitzsche
Approved revision: 85
Merged at revision: 78
Proposed branch: lp://staging/~abreu-alexandre/unity-webapps-qml/fix-content-hub-export
Merge into: lp://staging/unity-webapps-qml
Diff against target: 732 lines (+460/-57)
12 files modified
examples/api-bindings/content-hub-exporter/README (+18/-0)
examples/api-bindings/content-hub-exporter/content-hub-html5-exporter.desktop (+8/-0)
examples/api-bindings/content-hub-exporter/content-hub-html5-exporter.json (+9/-0)
examples/api-bindings/content-hub-exporter/content-hub/content-hub-html5-exporter.json (+5/-0)
examples/api-bindings/content-hub-exporter/main.qml.in (+31/-0)
examples/api-bindings/content-hub-exporter/manifest.json (+15/-0)
examples/api-bindings/content-hub-exporter/www/index.html (+22/-0)
examples/api-bindings/content-hub-exporter/www/js/app.js (+28/-0)
examples/api-bindings/content-hub/www/index.html (+15/-5)
examples/api-bindings/content-hub/www/js/app.js (+99/-42)
src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js (+99/-3)
src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js (+111/-7)
To merge this branch: bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/fix-content-hub-export
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
WebApps Pending
Review via email: mp+203835@code.staging.launchpad.net

Commit message

Fix content hub export

Description of the change

(for this you need cordova & the ubuntu-html5-container from the campo ppa).

This is a branch that adds some fixes to support the content hub export.

In order to properly test it, one needs 2 bits: the exporter (click package that declares itself as such) and the importer (that pulls from it).

The 2 bits are located in examples/ and easily identifiable.

so in order to test it *on desktop* (to ease up the process).

bzr branch lp:~abreu-alexandre/unity-webapps-qml/fix-content-hub-export
cd fix-content-hub-export
qmake
make
# the next step is a bit drastic we need to install the branch so that the click package
# can use the APIs in its js. One other option is to modify the desktop file of the click
# app to have a QML2_IMPORT_PATH variable in the Exec env that points
# to <yourpath>/fix-content-hub-export/src
sudo make install
cd examples/api-bindings/content-hub-exporter/
<follow the instructions in the README file>
cd ../content-hub
APP_ID=qmlscene qmlscene -I `pwd`/../../../src/ main.qml

from there, you should see at least 2 content hub picture providers: the gallery-app (default), and your click package above (identified by its appId).

select the click package (it should turn red) and click import.

result: you should see the window from the click package that opens shortly after
and the image displayed at the top in it being imported AND that appears in the HTML
of the importer app.

there should be a few logs in the html of both apps along the way.

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

update README for content hub exporter click

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Kyle Nitzsche (knitzsche) wrote :

It's a little awkward that the arg is the same as the method on line 77:
hub.onExportRequested(onExportRequested)

85. By Alexandre Abreu

Fix cb function name in content hub exporter example

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: