diff options
Diffstat (limited to 'js/controllers/styles-controller.js')
-rwxr-xr-x | js/controllers/styles-controller.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index c8b9376e..f6977a00 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -53,11 +53,11 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
53 | ///// Bind app's activeDocument property to | 53 | ///// Bind app's activeDocument property to |
54 | ///// styles controller's _activeDocument property | 54 | ///// styles controller's _activeDocument property |
55 | 55 | ||
56 | Object.defineBinding(this, "activeDocument", { | 56 | // Object.defineBinding(this, "activeDocument", { |
57 | boundObject: this.application.ninja, | 57 | // boundObject: this.application.ninja, |
58 | boundObjectPropertyPath: "currentDocument", | 58 | // boundObjectPropertyPath: "currentDocument", |
59 | oneway: true | 59 | // oneway: true |
60 | }); | 60 | // }); |
61 | } | 61 | } |
62 | }, | 62 | }, |
63 | 63 | ||
@@ -79,7 +79,6 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
79 | return this._activeDocument; | 79 | return this._activeDocument; |
80 | }, | 80 | }, |
81 | set : function(document) { | 81 | set : function(document) { |
82 | |||
83 | ///// If the document is null set default stylesheets to null | 82 | ///// If the document is null set default stylesheets to null |
84 | 83 | ||
85 | if(!document) { | 84 | if(!document) { |
@@ -1167,6 +1166,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1167 | 1166 | ||
1168 | getMatrixFromElement : { | 1167 | getMatrixFromElement : { |
1169 | value: function(element, isStage) { | 1168 | value: function(element, isStage) { |
1169 | isStage = false; | ||
1170 | var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage), | 1170 | var xformStr = this.getElementStyle(element, "-webkit-transform", true, isStage), |
1171 | mat; | 1171 | mat; |
1172 | 1172 | ||
@@ -1200,6 +1200,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1200 | 1200 | ||
1201 | getPerspectiveDistFromElement : { | 1201 | getPerspectiveDistFromElement : { |
1202 | value: function(element, isStage) { | 1202 | value: function(element, isStage) { |
1203 | isStage = false; | ||
1203 | var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage), | 1204 | var xformStr = this.getElementStyle(element, "-webkit-perspective", false, isStage), |
1204 | dist; | 1205 | dist; |
1205 | 1206 | ||