diff options
author | Nivesh Rajbhandari | 2012-06-01 14:54:19 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-01 14:54:19 -0700 |
commit | fd264c58bfc5f53f57d9ddfd06114124b14bac04 (patch) | |
tree | 41ac230e008fc53ae6a2590258aa5daa4224dca1 /js/ninja.reel/ninja.html | |
parent | 69ca67093bb53188dca5437e0bfbfb7f676ada85 (diff) | |
download | ninja-fd264c58bfc5f53f57d9ddfd06114124b14bac04.tar.gz |
Moving styles controller higher in ninja's serialization so its bindings will get triggered before stage's bindings. This should fix the stage's styles not getting initialized correctly.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 0c0944e7..33c3080f 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -150,6 +150,13 @@ | |||
150 | ] | 150 | ] |
151 | }, | 151 | }, |
152 | 152 | ||
153 | "stylesController": { | ||
154 | "prototype": "js/controllers/styles-controller", | ||
155 | "bindings": { | ||
156 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} | ||
157 | } | ||
158 | }, | ||
159 | |||
153 | "stageMode": { | 160 | "stageMode": { |
154 | "prototype": "js/components/layout/stage-mode.reel", | 161 | "prototype": "js/components/layout/stage-mode.reel", |
155 | "properties": { | 162 | "properties": { |
@@ -318,13 +325,6 @@ | |||
318 | "prototype": "js/controllers/color-controller" | 325 | "prototype": "js/controllers/color-controller" |
319 | }, | 326 | }, |
320 | 327 | ||
321 | "stylesController": { | ||
322 | "prototype": "js/controllers/styles-controller", | ||
323 | "bindings": { | ||
324 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} | ||
325 | } | ||
326 | }, | ||
327 | |||
328 | "presetsController": { | 328 | "presetsController": { |
329 | "prototype": "js/controllers/presets-controller" | 329 | "prototype": "js/controllers/presets-controller" |
330 | }, | 330 | }, |