Merge lp://staging/~webapps/unity-js-scopes/simple-click-example into lp://staging/unity-js-scopes
Proposed by
Marcus Tomlinson
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Alexandre Abreu | ||||||||
Approved revision: | 65 | ||||||||
Merged at revision: | 65 | ||||||||
Proposed branch: | lp://staging/~webapps/unity-js-scopes/simple-click-example | ||||||||
Merge into: | lp://staging/unity-js-scopes | ||||||||
Prerequisite: | lp://staging/~webapps/unity-js-scopes/build-in-silo | ||||||||
Diff against target: |
962 lines (+514/-103) 23 files modified
.bzrignore (+1/-0) CMakeLists.txt (+1/-0) debian/control (+0/-1) examples/simple-click/CMakeLists.txt (+38/-0) examples/simple-click/data/CMakeLists.txt (+9/-0) examples/simple-click/data/js-scope.webapps_js-scope.ini.in (+15/-0) examples/simple-click/js-scope.apparmor (+5/-0) examples/simple-click/manifest.json.in (+15/-0) examples/simple-click/src/CMakeLists.txt (+31/-0) examples/simple-click/src/js-scope.webapps_js-scope.js (+128/-0) examples/simple/simple.ini (+1/-1) src/bindings/src/addon.cc (+11/-2) src/bindings/src/event_queue.h (+104/-0) src/bindings/src/preview-query.cc (+19/-0) src/bindings/src/preview-query.h (+2/-0) src/bindings/src/preview-reply.cc (+21/-12) src/bindings/src/preview-reply.h (+7/-4) src/bindings/src/scope-base.cc (+71/-62) src/bindings/src/scope.cc (+7/-3) src/bindings/src/scope.h (+2/-1) src/bindings/src/search-query.cc (+19/-16) src/bindings/src/search-reply.cc (+5/-0) src/bindings/src/search-reply.h (+2/-1) |
||||||||
To merge this branch: | bzr merge lp://staging/~webapps/unity-js-scopes/simple-click-example | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandre Abreu (community) | Needs Information | ||
Review via email: mp+267167@code.staging.launchpad.net |
Commit message
Added a more complete example scope that invokes a simple web API and can be click packaged, with support for both search and preview requests (This also required me to fill in a few gaps in the bindings and fix how we handle invocations from external scopes threads)
To post a comment you must log in.
A few comments inline