aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-01 11:15:36 -0700
committerValerio Virgillito2012-06-01 11:15:36 -0700
commit62ac633975d6c461ec478887e574f6b155511a23 (patch)
treea849eef914eb606d6ca7ce08dfcde86ab5c99786 /js/stage
parent2085c783cf3a75d2b8f0370a6f54f62dd513161c (diff)
parentf457f110e560d50cb12f4cd3c4859bfc42a0ef3d (diff)
downloadninja-62ac633975d6c461ec478887e574f6b155511a23.tar.gz
Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into document-bindings-fix
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage.reel/stage.js4
1 files changed, 3 insertions, 1 deletions
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, {
1090 1090
1091 this.snapManager._isCacheInvalid = true; 1091 this.snapManager._isCacheInvalid = true;
1092 this.snapManager.currentStage = this.currentDocument.model.documentRoot; 1092 this.snapManager.currentStage = this.currentDocument.model.documentRoot;
1093 this.snapManager.setupDragPlaneFromPlane (workingPlane); 1093 //TODO - StylesController needs to initialize the stage's styles prior to calling this.
1094 // So, moving this into styles-controller.initializeRootStyles code.
1095// this.snapManager.setupDragPlaneFromPlane (workingPlane);
1094 1096
1095 this.drawUtils.initializeFromDocument(); 1097 this.drawUtils.initializeFromDocument();
1096 } 1098 }