diff options
author | Armen Kesablyan | 2012-06-28 13:21:29 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-28 13:43:35 -0700 |
commit | 0aea7c15ebee0b0e9d51c2ca4b7eeec598227af1 (patch) | |
tree | f5d931c404c8066b971ed5a66f95f86776eacf8b /js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | |
parent | 9add37d85a9d90541daae8ad5316388c4d9a9da4 (diff) | |
parent | f89895e5fb94a192d25f26249dadcb8ab225c72b (diff) | |
download | ninja-0aea7c15ebee0b0e9d51c2ca4b7eeec598227af1.tar.gz |
Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal into GIO_binding-view
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/stage/binding-view.reel/binding-hud.reel/binding-hud.js')
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js index 58cf197f..1b0af09d 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | |||
@@ -90,9 +90,17 @@ exports.BindingHud = Montage.create(Component, { | |||
90 | 90 | ||
91 | getPropertyList : { | 91 | getPropertyList : { |
92 | value: function(component) { | 92 | value: function(component) { |
93 | var props = this.application.ninja.objectsController.getPropertiesFromObject(component, true); | 93 | var props = this.application.ninja.objectsController.getPropertiesFromObject(component, true), |
94 | 94 | promotedProperties = [], | |
95 | var objectName, promotedProperties; | 95 | objectName; |
96 | |||
97 | ///// Mapper - property to property object | ||
98 | function propertyMapper(property) { | ||
99 | return { | ||
100 | property: property, | ||
101 | promoted: promotedProperties.indexOf(property) !== -1 | ||
102 | } | ||
103 | } | ||
96 | 104 | ||
97 | if(this.userElement.controller._montage_metadata) { | 105 | if(this.userElement.controller._montage_metadata) { |
98 | objectName = this.userElement.controller._montage_metadata.objectName; | 106 | objectName = this.userElement.controller._montage_metadata.objectName; |
@@ -115,7 +123,7 @@ exports.BindingHud = Montage.create(Component, { | |||
115 | } | 123 | } |
116 | } | 124 | } |
117 | 125 | ||
118 | return props; | 126 | return props.map(propertyMapper); |
119 | } | 127 | } |
120 | }, | 128 | }, |
121 | 129 | ||