aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-29 00:34:40 -0700
committerValerio Virgillito2012-05-29 00:34:40 -0700
commit4c3aac5eabd93052b1554a03d78235215bb49db4 (patch)
treefe08f4f6d33d81d602f56daeaec845577fb9d8a5 /js/ninja.reel
parent9a66ccad0235484643ef6d821315b11b5be4a93e (diff)
downloadninja-4c3aac5eabd93052b1554a03d78235215bb49db4.tar.gz
document bindings phase 1
- using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html80
-rwxr-xr-xjs/ninja.reel/ninja.js50
2 files changed, 93 insertions, 37 deletions
<
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 51d74cb2..f2b0a281 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -118,7 +118,7 @@
118 ] 118 ]
119 }, 119 },
120 120
121 "Resizer": { 121 "resizer3": {
122 "prototype": "js/panels/resize-composer", 122 "prototype": "js/panels/resize-composer",
123 "properties": { 123 "properties": {
124 "element": {"#": "pasteboardResizer"}, 124 "element": {"#": "pasteboardResizer"},
@@ -150,45 +150,48 @@
150 "element": {"#": "stageMode"} 150 "element": {"#": "stageMode"}
151 }, 151 },
152 "bindings" : { 152 "bindings" : {
153 "livePreview": { 153 "livePreview": {"<<->": "@appModel.livePreview"}
154 "boundObject": {"@": "appModel"},
155 "boundObjectPropertyPath": "livePreview",
156 "oneway": false
157 }
158 } 154 }
159 }, 155 },
160 156
161 "toolsList1": { 157 "toolsList": {
162 "prototype": "js/components/layout/tools-list.reel", 158 "prototype": "js/components/layout/tools-list.reel",
163 "properties": { 159 "properties": {
164 "element": {"#": "toolsList"}, 160 "element": {"#": "toolsList"},
165 "toolsData": {"@": "toolsData1"} 161 "toolsData": {"@": "toolsData1"}
162 },
163 "bindings": {
164 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
166 } 165 }
167 }, 166 },
168 167
169 "toolsProperties1": { 168 "toolsProperties": {
170 "prototype": "js/components/layout/tools-properties.reel", 169 "prototype": "js/components/layout/tools-properties.reel",
171 "properties": { 170 "properties": {
172 "element": {"#": "toolsProperties"}, 171 "element": {"#": "toolsProperties"},
173 "toolsData": {"@": "toolsData1"} 172 "toolsData": {"@": "toolsData1"}
173 },
174 "bindings": {
175 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
174 } 176 }
175 }, 177 },
176 178
177 "documentsTab": { 179 "documentsTab": {
178 "prototype": "js/components/layout/documents-tab.reel", 180 "prototype": "js/components/layout/documents-tab.reel",
179 "properties": { 181 "properties": {
180 "element": {"#": "openDocumentsTabComponent"} 182 "element": {"#": "openDocumentsTabComponent"},
183 "contentController": {"@": "documentList"}
181 } 184 }
182 }, 185 },
183 186
184 "stage1": { 187 "stage": {
185 "prototype": "js/stage/stage.reel", 188 "prototype": "js/stage/stage.reel",
186 "properties": { 189 "properties": {
187 "element": {"#": "stageAndScenesContainer"}, 190 "element": {"#": "stageAndScenesContainer"},
188 "appModel": {"@": "appModel"} 191 "appModel": {"@": "appModel"}
189 }, 192 },
190 "bindings": { 193 "bindings": {
191 "activeDocument": {"<-": "@documentController1.activeDocument"} 194 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
192 } 195 }
193 }, 196 },
194 197
@@ -196,6 +199,9 @@
196 "prototype": "js/components/layout/document-bar.reel", 199 "prototype": "js/components/layout/document-bar.reel",
197 "properties": { 200 "properties": {
198 "element": {"#": "documentBar"} 201 "element": {"#": "documentBar"}
202 },
203 "bindings": {
204 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
199 } 205 }
200 }, 206 },
201 207
@@ -212,6 +218,9 @@
212 "element": {"#": "rightPanelContent"}, 218 "element": {"#": "rightPanelContent"},
213 "panelSplitter": {"@": "splitter3"}, 219 "panelSplitter": {"@": "splitter3"},
214 "appModel": {"@": "appModel"} 220 "appModel": {"@": "appModel"}
221 },
222 "bindings" : {
223 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
215 } 224 }
216 }, 225 },
217 226
@@ -221,19 +230,16 @@
221 "element":{"#" : "breadCrumbComponent"} 230 "element":{"#" : "breadCrumbComponent"}
222 }, 231 },
223 "bindings" : { 232 "bindings" : {
224 "container": { 233 "container": {"<<->": "@owner.currentSelectedContainer"},
225 "boundObject": {"@": "owner"}, 234 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
226 "boundObjectPropertyPath": "currentSelectedContainer",
227 "oneway": false
228 }
229 } 235 }
230 }, 236 },
231 237
232 "timeline": { 238 "timeline": {
233 "prototype": "js/panels/Timeline/TimelinePanel.reel", 239 "prototype": "js/panels/Timeline/TimelinePanel.reel",
234 "properties": { 240 "properties": {
235 "element": {"#": "timelinePanelComponent"} 241 "element": {"#": "timelinePanelComponent"}
236 } 242 }
237 }, 243 },
238 244
239 "mouseMediator": { 245 "mouseMediator": {
@@ -263,17 +269,28 @@
263 "prototype": "js/controllers/undo-controller" 269 "prototype": "js/controllers/undo-controller"
264 }, 270 },
265 271
266 "selectionController1": { 272 "selectionController": {
267 "prototype": "js/controllers/selection-controller", 273 "prototype": "js/controllers/selection-controller",
268 "bindings" : { 274 "bindings" : {
269 "selectionContainer": {"<-": "@owner.currentSelectedContainer"} 275 "selectionContainer": {"<-": "@owner.currentSelectedContainer"},
276 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
270 } 277 }
271 }, 278 },
272 279
273 "documentController1": { 280 "documentController": {
274 "prototype": "js/controllers/document-controller" 281 "prototype": "js/controllers/document-controller"
275 }, 282 },
276 283
284 "documentList": {
285 "prototype": "montage/ui/controller/array-controller",
286 "properties": {
287 "selectObjectsOnAddition": true
288 },
289 "bindings": {
290 "content": {"<<->": "@documentController.documents"}
291 }
292 },
293
277 "popupManager1": { 294 "popupManager1": {
278 "prototype": "js/components/popup-manager.reel", 295 "prototype": "js/components/popup-manager.reel",
279 "properties": { 296 "properties": {
@@ -288,7 +305,7 @@
288 "stylesController": { 305 "stylesController": {
289 "prototype": "js/controllers/styles-controller", 306 "prototype": "js/controllers/styles-controller",
290 "bindings": { 307 "bindings": {
291 "activeDocument": {"<-": "@documentController1.activeDocument"} 308 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
292 } 309 }
293 }, 310 },
294 311
@@ -331,14 +348,14 @@
331 "rulerLeft": {"#": "rulerLeft"}, 348 "rulerLeft": {"#": "rulerLeft"},
332 "appModel": {"@": "appModel"}, 349 "appModel": {"@": "appModel"},
333 "toolsData": {"@": "toolsData1"}, 350 "toolsData": {"@": "toolsData1"},
334 "toolsList": {"@": "toolsList1"}, 351 "toolsList": {"@": "toolsList"},
335 "toolsProperties": {"@": "toolsProperties1"}, 352 "toolsProperties": {"@": "toolsProperties"},
336 "stage": {"@": "stage1"}, 353 "stage": {"@": "stage"},
337 "elementMediator": {"@": "elementMediator"}, 354 "elementMediator": {"@": "elementMediator"},
338 "dragDropMediator": {"@": "dragDropMediator"}, 355 "dragDropMediator": {"@": "dragDropMediator"},
339 "undocontroller": {"@": "undocontroller1"}, 356 "undocontroller": {"@": "undocontroller1"},
340 "selectionController": {"@": "selectionController1"}, 357 "selectionController": {"@": "selectionController"},
341 "documentController": {"@": "documentController1"}, 358 "documentController": {"@": "documentController"},
342 "popupManager": {"@": "popupManager1"}, 359 "popupManager": {"@": "popupManager1"},
343 "colorController": {"@": "colorController1"}, 360 "colorController": {"@": "colorController1"},
344 "stylesController": {"@": "stylesController"}, 361 "stylesController": {"@": "stylesController"},
@@ -356,7 +373,8 @@
356 "panelSplitter": {"@": "splitter3"}, 373 "panelSplitter": {"@": "splitter3"},
357 "timelineSplitter": {"@": "splitter4"}, 374 "timelineSplitter": {"@": "splitter4"},
358 "toolsSplitter": {"@": "splitter2"}, 375 "toolsSplitter": {"@": "splitter2"},
359 "optionsSplitter": {"@": "splitter1"} 376 "optionsSplitter": {"@": "splitter1"},
377 "documentList": {"@": "documentList"}
360 } 378 }
361 } 379 }
362 } 380 }
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index d0eb1557..0b4fd14d 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -18,12 +18,33 @@ exports.Ninja = Montage.create(Component, {
18 value: null 18 value: null
19 }, 19 },
20 20
21 toolsData: { value: null }, 21 toolsData: {