diff options
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 39efcf0c..59ac238c 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -36,22 +36,22 @@ 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) { |
45 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); | 45 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); |
46 | } else { | 46 | } else { |
47 | if (insertionIndex === 0) { | 47 | if (insertionIndex === 0) { |
48 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); | 48 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); |
49 | } else { | 49 | } else { |
50 | var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement; | 50 | var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement; |
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){ |