diff options
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/body-controller.js | 6 | ||||
-rwxr-xr-x | js/controllers/elements/component-controller.js | 4 | ||||
-rwxr-xr-x | js/controllers/elements/shapes-controller.js | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 943594f2..5c23dcf7 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
@@ -13,7 +13,7 @@ exports.BodyController = Montage.create(ElementController, { | |||
13 | set3DProperties: { | 13 | set3DProperties: { |
14 | value: function(el, props, update3DModel) { | 14 | value: function(el, props, update3DModel) { |
15 | var dist = props["dist"], mat = props["mat"]; | 15 | var dist = props["dist"], mat = props["mat"]; |
16 | this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true); | 16 | this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")"); |
17 | 17 | ||
18 | el.elementModel.props3D.matrix3d = mat; | 18 | el.elementModel.props3D.matrix3d = mat; |
19 | el.elementModel.props3D.perspectiveDist = dist; | 19 | el.elementModel.props3D.perspectiveDist = dist; |
@@ -49,13 +49,13 @@ exports.BodyController = Montage.create(ElementController, { | |||
49 | switch(p) { | 49 | switch(p) { |
50 | case "body-background": | 50 | case "body-background": |
51 | case "background": | 51 | case "background": |
52 | this.application.ninja.stylesController.setElementStyle(el, "background-color", value, true); | 52 | this.application.ninja.stylesController.setElementStyle(el, "background-color", value); |
53 | break; | 53 | break; |
54 | case "overflow": | 54 | case "overflow": |
55 | case "width": | 55 | case "width": |
56 | case "height": | 56 | case "height": |
57 | case "-webkit-transform-style": | 57 | case "-webkit-transform-style": |
58 | this.application.ninja.stylesController.setElementStyle(el, p, value, true); | 58 | this.application.ninja.stylesController.setElementStyle(el, p, value); |
59 | this.application.ninja.stage.updatedStage = true; | 59 | this.application.ninja.stage.updatedStage = true; |
60 | break; | 60 | break; |
61 | default: | 61 | default: |
diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js index d902e4a1..5b0aaeac 100755 --- a/js/controllers/elements/component-controller.js +++ b/js/controllers/elements/component-controller.js | |||
@@ -11,7 +11,7 @@ exports.ComponentController = Montage.create(ElementController, { | |||
11 | 11 | ||
12 | getProperty: { | 12 | getProperty: { |
13 | value: function(el, prop) { | 13 | value: function(el, prop) { |
14 | var component = el.controller || this.application.ninja.currentDocument.getComponentFromElement(el); | 14 | var component = el.controller || this.application.ninja.currentDocument.model.getComponentFromElement(el); |
15 | 15 | ||
16 | switch(prop) { | 16 | switch(prop) { |
17 | case "id": | 17 | case "id": |
@@ -34,7 +34,7 @@ exports.ComponentController = Montage.create(ElementController, { | |||
34 | 34 | ||
35 | setProperty: { | 35 | setProperty: { |
36 | value: function(el, p, value) { | 36 | value: function(el, p, value) { |
37 | var component = el.controller || this.application.ninja.currentDocument.getComponentFromElement(el); | 37 | var component = el.controller || this.application.ninja.currentDocument.model.getComponentFromElement(el); |
38 | 38 | ||
39 | switch(p) { | 39 | switch(p) { |
40 | case "id": | 40 | case "id": |
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index e9a5f865..38f133b5 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -213,7 +213,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
213 | default: | 213 | default: |
214 | CanvasController.setProperty(el, p, value); | 214 | CanvasController.setProperty(el, p, value); |
215 | } | 215 | } |
216 | this.application.ninja.documentController.activeDocument.needsSave = true; | 216 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
217 | } | 217 | } |
218 | }, | 218 | }, |
219 | 219 | ||
@@ -559,7 +559,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
559 | } | 559 | } |
560 | } | 560 | } |
561 | el.elementModel.shapeModel.GLWorld.render(); | 561 | el.elementModel.shapeModel.GLWorld.render(); |
562 | this.application.ninja.documentController.activeDocument.needsSave = true; | 562 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
563 | } | 563 | } |
564 | }, | 564 | }, |
565 | 565 | ||