diff options
author | Eric Guzman | 2012-05-31 10:57:09 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-31 10:57:09 -0700 |
commit | 4e28e2d2a695d487b1bc127dce0a874691539ca8 (patch) | |
tree | b00dd9e992d1d9cb7bc9076464de76c4a627954e /js/stage/binding-view.reel/binding-view.js | |
parent | e09efe3212e86ac794de3fc8ecfc6cdef7b15181 (diff) | |
parent | b7e33c16bab26f8ee0daa61f920cfdbcb7abc6e3 (diff) | |
download | ninja-4e28e2d2a695d487b1bc127dce0a874691539ca8.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/stage/binding-view.reel/binding-view.js')
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.js | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js index 97593c66..a0ca0c4f 100755 --- a/js/stage/binding-view.reel/binding-view.js +++ b/js/stage/binding-view.reel/binding-view.js | |||
@@ -20,7 +20,7 @@ exports.BindingView = Montage.create(Component, { | |||
20 | value: [] | 20 | value: [] |
21 | }, | 21 | }, |
22 | _nonVisualComponents: { | 22 | _nonVisualComponents: { |
23 | value:null | 23 | value:[] |
24 | }, | 24 | }, |
25 | 25 | ||
26 | //Public Objects | 26 | //Public Objects |
@@ -67,8 +67,27 @@ exports.BindingView = Montage.create(Component, { | |||
67 | value: function() { | 67 | value: function() { |
68 | if(this.selectedElement !== null) { | 68 | if(this.selectedElement !== null) { |
69 | this.bindables = [ | 69 | this.bindables = [ |
70 | {"objectName": "Input1", "objectTitle": ""}, | 70 | { |
71 | ] | 71 | "title": "Input1", |
72 | "properties": [ | ||
73 | {"title":"Value"}, | ||
74 | {"title": "Width"} | ||
75 | ], | ||
76 | "x": 20, | ||
77 | "y": 20 | ||
78 | }, | ||
79 | { | ||
80 | "title": "Checkbox1", | ||
81 | "properties": [ | ||
82 | {"title":"Group"}, | ||
83 | {"title": "Value"} | ||
84 | ], | ||
85 | "x": 120, | ||
86 | "y": 120 | ||
87 | } | ||
88 | ]; | ||
89 | } else { | ||
90 | this.bindables = []; | ||
72 | } | 91 | } |
73 | } | 92 | } |
74 | }, | 93 | }, |