aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
diff options
context:
space:
mode:
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-xjs/controllers/elements/element-controller.js8
-rwxr-xr-xjs/controllers/elements/shapes-controller.js2
2 files changed, 5 insertions, 5 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 646fa455..59ac238c 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -36,9 +36,9 @@ exports.ElementController = Montage.create(Component, {
36 36
37 addElement: { 37 addElement: {
38 value: function(el, styles) { 38 value: function(el, styles) {
39 39
40 if (el.getAttribute) el.setAttribute('data-ninja-node', 'true'); 40 if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
41 41
42 // Updated to use new methods in TimelinePanel. JR. 42 // Updated to use new methods in TimelinePanel. JR.
43 var insertionIndex = this.application.ninja.timeline.getInsertionIndex(); 43 var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
44 if (insertionIndex === false) { 44 if (insertionIndex === false) {
@@ -51,7 +51,7 @@ exports.ElementController = Montage.create(Component, {
51 element.parentNode.insertBefore(el, element.nextSibling); 51 element.parentNode.insertBefore(el, element.nextSibling);
52 } 52 }
53 } 53 }
54 54
55 if(styles) { 55 if(styles) {
56 this.application.ninja.stylesController.setElementStyles(el, styles); 56 this.application.ninja.stylesController.setElementStyles(el, styles);
57 } 57 }
@@ -67,7 +67,7 @@ exports.ElementController = Montage.create(Component, {
67 el.parentNode.removeChild(el); 67 el.parentNode.removeChild(el);
68 } 68 }
69 }, 69 },
70 70
71 getProperty: { 71 getProperty: {
72 value: function(el, prop, fallbackOnComputed, isStageElement) { 72 value: function(el, prop, fallbackOnComputed, isStageElement) {
73 if(el.nodeType !== 3){ 73 if(el.nodeType !== 3){
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index bef315ba..e6774858 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -300,7 +300,7 @@ exports.ShapesController = Montage.create(CanvasController, {
300 return null; 300 return null;
301 } 301 }
302 break; 302 break;
303 303
304 304
305 case "strokeMaterial": 305 case "strokeMaterial":
306 var sm = el.elementModel.shapeModel.GLGeomObj.getStrokeMaterial(); 306 var sm = el.elementModel.shapeModel.GLGeomObj.getStrokeMaterial();