aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-01 06:47:50 -0700
committerNivesh Rajbhandari2012-06-01 06:47:50 -0700
commitb7f048624c07a1186cca080bf4c9a87af7d53f35 (patch)
tree38f9f63d409f3e4c8769fa8a4da8f41097e7e1fc
parent294baf576986adb139406e516d8461070fdfd695 (diff)
downloadninja-b7f048624c07a1186cca080bf4c9a87af7d53f35.tar.gz
SnapManager.setupDragPlaneFromPlane must happen after StylesController has finished initializeRootStyles.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-xjs/controllers/styles-controller.js6
-rwxr-xr-xjs/stage/stage.reel/stage.js4
2 files changed, 9 insertions, 1 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 86df82de..14857bf9 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -179,6 +179,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
179 this.setStyles(rule, styles); 179 this.setStyles(rule, styles);
180 this.addClass(this.currentDocument.model.documentRoot, "ninja-body"); 180 this.addClass(this.currentDocument.model.documentRoot, "ninja-body");
181 } 181 }
182
183 //TODO - Temporarily moving this here so we guarantee the StylesController has a chance
184 // to initialize the stage's styles prior to doing any styles lookup.
185 this.application.ninja.stage.snapManager.setupDragPlaneFromPlane (workingPlane);
182 } 186 }
183 }, 187 },
184 /* ----------------- Rule methods ----------------- */ 188 /* ----------------- Rule methods ----------------- */
@@ -1204,6 +1208,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
1204 1208
1205 getMatrixFromElement : { 1209 getMatrixFromElement : {
1206 value: function(element, isStage) { 1210 value: function(element, isStage) {
1211 isStage = false;
1207 var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage), 1212 var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage),
1208 mat; 1213 mat;
1209 1214
@@ -1237,6 +1242,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
1237 1242
1238 getPerspectiveDistFromElement : { 1243 getPerspectiveDistFromElement : {
1239 value: function(element, isStage) { 1244 value: function(element, isStage) {
1245 isStage = false;
1240 var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage), 1246 var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage),
1241 dist; 1247 dist;
1242 1248
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 087606d0..5a1d7f78 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -1102,7 +1102,9 @@ exports.Stage = Montage.create(Component, {
1102 1102
1103 this.snapManager._isCacheInvalid = true; 1103 this.snapManager._isCacheInvalid = true;
1104 this.snapManager.currentStage = this.application.ninja.currentDocument.model.documentRoot; 1104 this.snapManager.currentStage = this.application.ninja.currentDocument.model.documentRoot;
1105 this.snapManager.setupDragPlaneFromPlane (workingPlane); 1105 //TODO - StylesController needs to initialize the stage's styles prior to calling this.
1106 // So, moving this into styles-controller.initializeRootStyles code.
1107// this.snapManager.setupDragPlaneFromPlane (workingPlane);
1106 1108
1107 this.drawUtils.initializeFromDocument(); 1109 this.drawUtils.initializeFromDocument();
1108 } 1110 }