From fd264c58bfc5f53f57d9ddfd06114124b14bac04 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 1 Jun 2012 14:54:19 -0700 Subject: 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 --- js/ninja.reel/ninja.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'js/ninja.reel') 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 @@ ] }, + "stylesController": { + "prototype": "js/controllers/styles-controller", + "bindings": { + "currentDocument": {"<-": "@documentList.selectedObjects.0"} + } + }, + "stageMode": { "prototype": "js/components/layout/stage-mode.reel", "properties": { @@ -318,13 +325,6 @@ "prototype": "js/controllers/color-controller" }, - "stylesController": { - "prototype": "js/controllers/styles-controller", - "bindings": { - "currentDocument": {"<-": "@documentList.selectedObjects.0"} - } - }, - "presetsController": { "prototype": "js/controllers/presets-controller" }, -- cgit v1.2.3