Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into document-bindings-fix

2 files changed, 9 insertions, 1 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 8d56370d..863348cd 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -160,6 +160,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 this.setStyles(rule, styles);
                 this.addClass(this.currentDocument.model.documentRoot, "ninja-body");
             }
+
+            //TODO - Temporarily moving this here so we guarantee the StylesController has a chance
+            // to initialize the stage's styles prior to doing any styles lookup.
+            this.application.ninja.stage.snapManager.setupDragPlaneFromPlane (workingPlane);
         }
     },
     /* ----------------- Rule methods ----------------- */
@@ -1185,6 +1189,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getMatrixFromElement : {
         value: function(element, isStage) {
+            isStage = false;
             var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage),
                 mat;
 
@@ -1218,6 +1223,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
 
     getPerspectiveDistFromElement : {
         value: function(element, isStage) {
+            isStage = false;
             var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage),
                 dist;
 
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index d8f7313b..4d9296a1 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -1090,7 +1090,9 @@ exports.Stage = Montage.create(Component, {
 
             this.snapManager._isCacheInvalid = true;
             this.snapManager.currentStage = this.currentDocument.model.documentRoot;
-            this.snapManager.setupDragPlaneFromPlane (workingPlane);
+                        //TODO - StylesController needs to initialize the stage's styles prior to calling this.
+            // So, moving this into styles-controller.initializeRootStyles code.
+//            this.snapManager.setupDragPlaneFromPlane (workingPlane);
 
             this.drawUtils.initializeFromDocument();
         }