aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-31 14:34:36 -0700
committerValerio Virgillito2012-05-31 14:34:36 -0700
commitfdc49789aaf892126f80cb17cca7f3d3b3b080bb (patch)
treefd87f765fd93aa43ff62ac1c5a68559cc753d722 /js/controllers
parent19e3d87a8428a44c9edf3df47998c3bfe93b3c90 (diff)
parent0b830a8c6415e9cc255d1593a05ae3fa9d94c5e2 (diff)
downloadninja-fdc49789aaf892126f80cb17cca7f3d3b3b080bb.tar.gz
Merge pull request #4 from mqg734/dom-architecture-pentool
Adding back the stage references in the 3d classes and fixing styles lookup for the stage.
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/styles-controller.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index f35a6757..86df82de 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -1204,7 +1204,6 @@ var stylesController = exports.StylesController = Montage.create(Component, {
1204 1204
1205 getMatrixFromElement : { 1205 getMatrixFromElement : {
1206 value: function(element, isStage) { 1206 value: function(element, isStage) {
1207 isStage = false;
1208 var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage), 1207 var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage),
1209 mat; 1208 mat;
1210 1209
@@ -1238,7 +1237,6 @@ var stylesController = exports.StylesController = Montage.create(Component, {
1238 1237
1239 getPerspectiveDistFromElement : { 1238 getPerspectiveDistFromElement : {
1240 value: function(element, isStage) { 1239 value: function(element, isStage) {
1241 isStage = false;
1242 var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage), 1240 var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage),
1243 dist; 1241 dist;
1244 1242