diff options
author | Armen Kesablyan | 2012-06-07 10:22:03 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-07 10:22:03 -0700 |
commit | 85847ff047850808ba2bcfb43a6aa83913376b5b (patch) | |
tree | c15255127da11000c651984c5cbbbfba267d9b0a | |
parent | 557473639c1854d2e545f542d5f8656a040d575c (diff) | |
download | ninja-85847ff047850808ba2bcfb43a6aa83913376b5b.tar.gz |
Changes to Binding View
Signed-off-by: Armen Kesablyan <armen@motorola.com>
-rw-r--r-- | js/controllers/objects-controller.js | 3 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.js | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js index 6da53b0f..ee203336 100644 --- a/js/controllers/objects-controller.js +++ b/js/controllers/objects-controller.js | |||
@@ -143,11 +143,8 @@ var objectsController = exports.ObjectsController = Montage.create(Component, { | |||
143 | var properties = []; | 143 | var properties = []; |
144 | 144 | ||
145 | for(var key in object) { | 145 | for(var key in object) { |
146 | debugger; | ||
147 | if(object.hasOwnProperty(key)) { | 146 | if(object.hasOwnProperty(key)) { |
148 | if(key.serializable) { | ||
149 | properties.push(key); | 147 | properties.push(key); |
150 | } | ||
151 | } | 148 | } |
152 | } | 149 | } |
153 | 150 | ||
diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js index d76aab81..1457e2fc 100755 --- a/js/stage/binding-view.reel/binding-view.js +++ b/js/stage/binding-view.reel/binding-view.js | |||
@@ -16,9 +16,17 @@ exports.BindingView = Montage.create(Component, { | |||
16 | _selectedComponent: { | 16 | _selectedComponent: { |
17 | value: null | 17 | value: null |
18 | }, | 18 | }, |
19 | |||
20 | //Bindables Format: [ | ||
21 | |||
22 | //] | ||
23 | |||
24 | |||
19 | _bindables: { | 25 | _bindables: { |
20 | value: [] | 26 | value: [] |
21 | }, | 27 | }, |
28 | |||
29 | |||
22 | _nonVisualComponents: { | 30 | _nonVisualComponents: { |
23 | value:[] | 31 | value:[] |
24 | }, | 32 | }, |
@@ -46,10 +54,12 @@ exports.BindingView = Montage.create(Component, { | |||
46 | this._selectedComponent = val; | 54 | this._selectedComponent = val; |
47 | this.application.ninja.objectsController.currentObject = this.selectedComponent; | 55 | this.application.ninja.objectsController.currentObject = this.selectedComponent; |
48 | var arrBindings = this.application.ninja.objectsController.currentObjectBindings; | 56 | var arrBindings = this.application.ninja.objectsController.currentObjectBindings; |
57 | |||
49 | debugger; | 58 | debugger; |
50 | arrBindings.forEach(function(obj) { | 59 | arrBindings.forEach(function(obj) { |
51 | 60 | ||
52 | }.bind(this)); | 61 | }.bind(this)); |
62 | this.bindables.push(this._selectedComponent); | ||
53 | // Get Bindings that exist; | 63 | // Get Bindings that exist; |
54 | 64 | ||
55 | 65 | ||