aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorKruti Shah2012-06-12 13:09:11 -0700
committerKruti Shah2012-06-12 13:09:11 -0700
commitd648c842905c7c53e0f89b943982493d2b79f56e (patch)
treeeb5585f92061975215f6d19305a8d1b76262e2fc /js/ninja.reel
parentbedb38e14887b29eae3cdf1c8d435259c920257c (diff)
parentcf3b96822665751dae7a64644db3cb3960733c3d (diff)
downloadninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html122
-rwxr-xr-xjs/ninja.reel/ninja.js126
2 files changed, 162 insertions, 86 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 51d74cb2..a98fca60 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -25,7 +25,10 @@
25 }, 25 },
26 26
27 "appModel": { 27 "appModel": {
28 "prototype": "js/models/app-model" 28 "prototype": "js/models/app-model",
29 "bindings": {
30 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
31 }
29 }, 32 },
30 33
31 "materialsModel": { 34 "materialsModel": {
@@ -36,6 +39,9 @@
36 "prototype": "js/components/menu/menu.reel", 39 "prototype": "js/components/menu/menu.reel",
37 "properties": { 40 "properties": {
38 "element": {"#": "mainMenuBar"} 41 "element": {"#": "mainMenuBar"}
42 },
43 "bindings": {
44 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
39 } 45 }
40 }, 46 },
41 47
@@ -118,7 +124,7 @@
118 ] 124 ]
119 }, 125 },
120 126
121 "Resizer": { 127 "resizer3": {
122 "prototype": "js/panels/resize-composer", 128 "prototype": "js/panels/resize-composer",
123 "properties": { 129 "properties": {
124 "element": {"#": "pasteboardResizer"}, 130 "element": {"#": "pasteboardResizer"},
@@ -144,51 +150,61 @@
144 ] 150 ]
145 }, 151 },
146 152
153 "stylesController": {
154 "prototype": "js/controllers/styles-controller",
155 "bindings": {
156 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
157 }
158 },
159
147 "stageMode": { 160 "stageMode": {
148 "prototype": "js/components/layout/stage-mode.reel", 161 "prototype": "js/components/layout/stage-mode.reel",
149 "properties": { 162 "properties": {
150 "element": {"#": "stageMode"} 163 "element": {"#": "stageMode"}
151 }, 164 },
152 "bindings" : { 165 "bindings" : {
153 "livePreview": { 166 "livePreview": {"<<->": "@appModel.livePreview"}
154 "boundObject": {"@": "appModel"},
155 "boundObjectPropertyPath": "livePreview",
156 "oneway": false
157 }
158 } 167 }
159 }, 168 },
160 169
161 "toolsList1": { 170 "toolsList": {
162 "prototype": "js/components/layout/tools-list.reel", 171 "prototype": "js/components/layout/tools-list.reel",
163 "properties": { 172 "properties": {
164 "element": {"#": "toolsList"}, 173 "element": {"#": "toolsList"},
165 "toolsData": {"@": "toolsData1"} 174 "toolsData": {"@": "toolsData1"}
175 },
176 "bindings": {
177 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
166 } 178 }
167 }, 179 },
168 180
169 "toolsProperties1": { 181 "toolsProperties": {
170 "prototype": "js/components/layout/tools-properties.reel", 182 "prototype": "js/components/layout/tools-properties.reel",
171 "properties": { 183 "properties": {
172 "element": {"#": "toolsProperties"}, 184 "element": {"#": "toolsProperties"},
173 "toolsData": {"@": "toolsData1"} 185 "toolsData": {"@": "toolsData1"}
186 },
187 "bindings": {
188 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
174 } 189 }
175 }, 190 },
176 191
177 "documentsTab": { 192 "documentsTab": {
178 "prototype": "js/components/layout/documents-tab.reel", 193 "prototype": "js/components/layout/documents-tab.reel",
179 "properties": { 194 "properties": {
180 "element": {"#": "openDocumentsTabComponent"} 195 "element": {"#": "openDocumentsTabComponent"},
196 "contentController": {"@": "documentList"}
181 } 197 }
182 }, 198 },
183 199
184 "stage1": { 200 "stage": {
185 "prototype": "js/stage/stage.reel", 201 "prototype": "js/stage/stage.reel",
186 "properties": { 202 "properties": {
187 "element": {"#": "stageAndScenesContainer"}, 203 "element": {"#": "stageAndScenesContainer"},
188 "appModel": {"@": "appModel"} 204 "appModel": {"@": "appModel"}
189 }, 205 },
190 "bindings": { 206 "bindings": {
191 "activeDocument": {"<-": "@documentController1.activeDocument"} 207 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
192 } 208 }
193 }, 209 },
194 210
@@ -196,6 +212,9 @@
196 "prototype": "js/components/layout/document-bar.reel", 212 "prototype": "js/components/layout/document-bar.reel",
197 "properties": { 213 "properties": {
198 "element": {"#": "documentBar"} 214 "element": {"#": "documentBar"}
215 },
216 "bindings": {
217 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
199 } 218 }
200 }, 219 },
201 220
@@ -203,6 +222,9 @@
203 "prototype": "js/code-editor/ui/code-editor-view-options.reel", 222 "prototype": "js/code-editor/ui/code-editor-view-options.reel",
204 "properties": { 223 "properties": {
205 "element": {"#": "editorViewOptions"} 224 "element": {"#": "editorViewOptions"}
225 },
226 "bindings" : {
227 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
206 } 228 }
207 }, 229 },
208 230
@@ -212,6 +234,9 @@
212 "element": {"#": "rightPanelContent"}, 234 "element": {"#": "rightPanelContent"},
213 "panelSplitter": {"@": "splitter3"}, 235 "panelSplitter": {"@": "splitter3"},
214 "appModel": {"@": "appModel"} 236 "appModel": {"@": "appModel"}
237 },
238 "bindings" : {
239 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
215 } 240 }
216 }, 241 },
217 242
@@ -221,19 +246,19 @@
221 "element":{"#" : "breadCrumbComponent"} 246 "element":{"#" : "breadCrumbComponent"}
222 }, 247 },
223 "bindings" : { 248 "bindings" : {
224 "container": { 249 "container": {"<-": "@owner.currentSelectedContainer"},
225 "boundObject": {"@": "owner"}, 250 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
226 "boundObjectPropertyPath": "currentSelectedContainer",
227 "oneway": false
228 }
229 } 251 }
230 }, 252 },
231 253
232 "timeline": { 254 "timeline": {
233 "prototype": "js/panels/Timeline/TimelinePanel.reel", 255 "prototype": "js/panels/Timeline/TimelinePanel.reel",
234 "properties": { 256 "properties": {
235 "element": {"#": "timelinePanelComponent"} 257 "element": {"#": "timelinePanelComponent"}
236 } 258 },
259 "bindings": {
260 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
261 }
237 }, 262 },
238 263
239 "mouseMediator": { 264 "mouseMediator": {
@@ -263,15 +288,30 @@
263 "prototype": "js/controllers/undo-controller" 288 "prototype": "js/controllers/undo-controller"
264 }, 289 },
265 290
266 "selectionController1": { 291 "selectionController": {
267 "prototype": "js/controllers/selection-controller", 292 "prototype": "js/controllers/selection-controller",
268 "bindings" : { 293 "bindings" : {
269 "selectionContainer": {"<-": "@owner.currentSelectedContainer"} 294 "selectionContainer": {"<-": "@owner.currentSelectedContainer"},
295 "currentDocument": {"<-": "@documentList.selectedObjects.0"},
296 "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"}
270 } 297 }
271 }, 298 },
272 299
273 "documentController1": { 300 "documentController": {
274 "prototype": "js/controllers/document-controller" 301 "prototype": "js/controllers/document-controller",
302 "bindings": {
303 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
304 }
305 },
306
307 "documentList": {
308 "prototype": "montage/ui/controller/array-controller",
309 "properties": {
310 "selectObjectsOnAddition": true
311 },
312 "bindings": {
313 "content": {"<<->": "@documentController.documents"}
314 }
275 }, 315 },
276 316