unity-js-scopes

Merge lp://qastaging/~marcustomlinson/unity-js-scopes/lp-1541720 into lp://qastaging/unity-js-scopes

lp-1541720
Merge into trunk

Proposed by Marcus Tomlinson on 2016-02-04

Status:

Merged

Approved by:

Marcus Tomlinson on 2016-02-09

Approved revision:

126

Merged at revision:

127

Proposed branch:

lp://qastaging/~marcustomlinson/unity-js-scopes/lp-1541720

Merge into:

lp://qastaging/unity-js-scopes

Diff against target:

120 lines (+45/-14)

4 files modified

src/bindings/src/common.cc (+21/-13)
src/bindings/src/preview-widget.cc (+18/-1)
src/bindings/src/variant.cc (+4/-0)
src/bindings/src/variant.h (+2/-0)

To merge this branch:

bzr merge lp://qastaging/~marcustomlinson/unity-js-scopes/lp-1541720

High

Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Alexandre Abreu (community)		2016-02-04	Approve on 2016-02-09
PS Jenkins bot (community)	continuous-integration		Approve on 2016-02-04
Review via email: mp+285032@code.qastaging.launchpad.net

Commit message

* Check if the value given to unity::scopesjs::to_variant() is not already a bound Variant type.
* Do array check before object check in unity::scopesjs::to_variant() (arrays are also objects).
* Handle array of dicts when recieving object variants in PreviewWidget::add_attribute_value().