diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/ninja.reel | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.html | 10 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 187 |
2 files changed, 164 insertions, 33 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 11f7c53e..0a959812 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -163,7 +163,7 @@ | |||
163 | "element": {"#": "stageMode"} | 163 | "element": {"#": "stageMode"} |
164 | }, | 164 | }, |
165 | "bindings" : { | 165 | "bindings" : { |
166 | "livePreview": {"<<->": "@appModel.livePreview"} | 166 | "livePreview": {"<->": "@appModel.livePreview"} |
167 | } | 167 | } |
168 | }, | 168 | }, |
169 | 169 | ||
@@ -246,7 +246,7 @@ | |||
246 | "element":{"#" : "breadCrumbComponent"} | 246 | "element":{"#" : "breadCrumbComponent"} |
247 | }, | 247 | }, |
248 | "bindings" : { | 248 | "bindings" : { |
249 | "container": {"<-": "@owner.currentSelectedContainer"}, | 249 | |
250 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} | 250 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} |
251 | } | 251 | } |
252 | }, | 252 | }, |
@@ -291,9 +291,7 @@ | |||
291 | "selectionController": { | 291 | "selectionController": { |
292 | "prototype": "js/controllers/selection-controller", | 292 | "prototype": "js/controllers/selection-controller", |
293 | "bindings" : { | 293 | "bindings" : { |
294 | "selectionContainer": {"<-": "@owner.currentSelectedContainer"}, | 294 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} |
295 | "currentDocument": {"<-": "@documentList.selectedObjects.0"}, | ||
296 | "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"} | ||
297 | } | 295 | } |
298 | }, | 296 | }, |
299 | 297 | ||
@@ -310,7 +308,7 @@ | |||
310 | "selectObjectsOnAddition": true | 308 | "selectObjectsOnAddition": true |
311 | }, | 309 | }, |
312 | "bindings": { | 310 | "bindings": { |
313 | "content": {"<<->": "@documentController.documents"} | 311 | "content": {"<->": "@documentController.documents"} |
314 | } | 312 | } |
315 | }, | 313 | }, |
316 | 314 | ||
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 4127e59a..f1825b9a 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -15,22 +15,172 @@ var NjUtils = require("js/lib/NJUtils").NJUtils; | |||
15 | 15 | ||
16 | exports.Ninja = Montage.create(Component, { | 16 | exports.Ninja = Montage.create(Component, { |
17 | 17 | ||
18 | ninjaVersion: { | 18 | // SERIALIZABLE Properties |
19 | value: null | 19 | ////////////////////////////// |
20 | rulerTop: { | ||
21 | value: null, | ||
22 | serializable: true | ||
23 | }, | ||
24 | |||
25 | rulerLeft: { | ||
26 | value: null, | ||
27 | serializable: true | ||
28 | }, | ||
29 | |||
30 | appModel: { | ||
31 | value: null, | ||
32 | serializable: true | ||
20 | }, | 33 | }, |
21 | 34 | ||
22 | toolsData: { | 35 | toolsData: { |
23 | value: null | 36 | value: null, |
37 | serializable: true | ||
24 | }, | 38 | }, |
25 | 39 | ||
26 | appData: { | 40 | toolsList: { |
27 | value: AppData | 41 | value: null, |
42 | serializable: true | ||
43 | }, | ||
44 | |||
45 | toolsProperties: { | ||
46 | value: null, | ||
47 | serializable: true | ||
48 | }, | ||
49 | |||
50 | stage: { | ||
51 | value: null, | ||
52 | serializable: true | ||
53 | }, | ||
54 | |||
55 | elementMediator: { | ||
56 | value: null, | ||
57 | serializable: true | ||
58 | }, | ||
59 | |||
60 | dragDropMediator: { | ||
61 | value: null, | ||
62 | serializable: true | ||
63 | }, | ||
64 | |||
65 | undocontroller: { | ||
66 | value: null, | ||
67 | serializable: true | ||
68 | }, | ||
69 | |||
70 | selectionController: { | ||
71 | value: null, | ||
72 | serializable: true | ||
73 | }, | ||
74 | |||
75 | documentController: { | ||
76 | value: null, | ||
77 | serializable: true | ||
78 | }, | ||
79 | |||
80 | popupManager: { | ||
81 | value: null, | ||
82 | serializable: true | ||
83 | }, | ||
84 | |||
85 | colorController: { | ||
86 | value: null, | ||
87 | serializable: true | ||
88 | }, | ||
89 | |||
90 | stylesController: { | ||
91 | value: null, | ||
92 | serializable: true | ||
93 | }, | ||
94 | |||
95 | presetsController: { | ||
96 | value: null, | ||
97 | serializable: true | ||
98 | }, | ||
99 | |||
100 | filePickerController: { | ||
101 | value: null, | ||
102 | serializable: true | ||
103 | }, | ||
104 | |||
105 | newFileController: { | ||
106 | value: null, | ||
107 | serializable: true | ||
108 | }, | ||
109 | |||
110 | coreIoApi: { | ||
111 | value: null, | ||
112 | serializable: true | ||
113 | }, | ||
114 | |||
115 | documentBar: { | ||
116 | value: null, | ||
117 | serializable: true | ||
118 | }, | ||
119 | |||
120 | editorViewOptions: { | ||
121 | value: null, | ||
122 | serializable: true | ||
123 | }, | ||
124 | |||
125 | ioMediator: { | ||
126 | value: null, | ||
127 | serializable: true | ||
128 | }, | ||
129 | |||
130 | timeline: { | ||
131 | value: null, | ||
132 | serializable: true | ||
133 | }, | ||
134 | |||
135 | mainMenuController: { | ||
136 | value: null, | ||
137 | serializable: true | ||
138 | }, | ||
139 | |||
140 | codeEditorController: { | ||
141 | value: null, | ||
142 | serializable: true | ||
143 | }, | ||
144 | |||
145 | rightPanelContainer: { | ||
146 | value: null, | ||
147 | serializable: true | ||
148 | }, | ||
149 | |||
150 | panelSplitter: { | ||
151 | value: null, | ||
152 | serializable: true | ||
153 | }, | ||
154 | |||
155 | timelineSplitter: { | ||
156 | value: null, | ||
157 | serializable: true | ||
158 | }, | ||
159 | |||
160 | toolsSplitter: { | ||
161 | value: null, | ||
162 | serializable: true | ||
163 | }, | ||
164 | |||
165 | optionsSplitter: { | ||
166 | value: null, | ||
167 | serializable: true | ||
28 | }, | 168 | }, |
29 | 169 | ||
30 | documentList: { | 170 | documentList: { |
171 | value: null, | ||
172 | serializable: true | ||
173 | }, | ||
174 | ////////////////////////////// | ||
175 | |||
176 | ninjaVersion: { | ||
31 | value: null | 177 | value: null |
32 | }, | 178 | }, |
33 | 179 | ||
180 | appData: { | ||
181 | value: AppData | ||
182 | }, | ||
183 | |||
34 | currentDocument: { | 184 | currentDocument: { |
35 | get: function() { | 185 | get: function() { |
36 | if(this.documentList.selectedObjects) { | 186 | if(this.documentList.selectedObjects) { |
@@ -171,21 +321,6 @@ exports.Ninja = Montage.create(Component, { | |||
171 | value: [] | 321 | value: [] |
172 | }, | 322 | }, |
173 | 323 | ||
174 | _currentSelectedContainer: { | ||
175 | value: null | ||
176 | }, | ||
177 | |||
178 | currentSelectedContainer: { | ||
179 | get: function() { | ||
180 | return this._currentSelectedContainer; | ||
181 | }, | ||
182 | set: function(value) { | ||
183 | if(value !== this._currentSelectedContainer) { | ||
184 | this._currentSelectedContainer = value; | ||
185 | } | ||
186 |