diff options
Diffstat (limited to 'js')
33 files changed, 2382 insertions, 1007 deletions
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js index 803770db..08e87bf0 100644 --- a/js/components/hintable.reel/hintable.js +++ b/js/components/hintable.reel/hintable.js | |||
@@ -146,7 +146,11 @@ exports.Hintable = Montage.create(Editable, { | |||
146 | }, | 146 | }, |
147 | set: function(str) { | 147 | set: function(str) { |
148 | var node = this._getFirstTextNode(); | 148 | var node = this._getFirstTextNode(); |
149 | node.textContent = str; | 149 | if (node.textContent !== str) { |
150 | node.textContent = str; | ||
151 | } | ||
152 | |||
153 | //node.innerText = str; | ||
150 | } | 154 | } |
151 | }, | 155 | }, |
152 | 156 | ||
@@ -331,4 +335,4 @@ exports.Hintable = Montage.create(Editable, { | |||
331 | distinct: true | 335 | distinct: true |
332 | } | 336 | } |
333 | 337 | ||
334 | }); \ No newline at end of file | 338 | }); |
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 941e05ba..308e598b 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -15,13 +15,32 @@ exports.ElementController = Montage.create(Component, { | |||
15 | 15 | ||
16 | if (el.getAttribute) el.setAttribute('data-ninja-node', 'true'); | 16 | if (el.getAttribute) el.setAttribute('data-ninja-node', 'true'); |
17 | 17 | ||
18 | // Updated to use new methods in TimelinePanel. JR. | ||
19 | var insertionIndex = this.application.ninja.timeline.getInsertionIndex(); | ||
20 | if (insertionIndex === false) { | ||
21 | this.application.ninja.currentSelectedContainer.appendChild(el); | ||
22 | } else { | ||
23 | if (insertionIndex === 0) { | ||
24 | this.application.ninja.currentSelectedContainer.appendChild(el); | ||
25 | } else { | ||
26 | var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement; | ||
27 | element.parentNode.insertBefore(el, element.nextSibling); | ||
28 | } | ||
29 | } | ||
30 | |||
31 | if(styles) { | ||
32 | this.application.ninja.stylesController.setElementStyles(el, styles); | ||
33 | } | ||
34 | |||
35 | /* | ||
36 | // Old methods. Kept for reference. Delete if not needed. JR. | ||
18 | if(this.application.ninja.timeline.currentLayerSelected) { | 37 | if(this.application.ninja.timeline.currentLayerSelected) { |
19 | var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID); | 38 | var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID); |
20 | 39 | ||
21 | if(selectedLayerIndex === 0) { | 40 | if(selectedLayerIndex === 0) { |
22 | this.application.ninja.currentSelectedContainer.appendChild(el); | 41 | this.application.ninja.currentSelectedContainer.appendChild(el); |
23 | } else { | 42 | } else { |
24 | var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0]; | 43 | var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.stageElement; |
25 | element.parentNode.insertBefore(el, element.nextSibling); | 44 | element.parentNode.insertBefore(el, element.nextSibling); |
26 | } | 45 | } |
27 | } else { | 46 | } else { |
@@ -31,6 +50,7 @@ exports.ElementController = Montage.create(Component, { | |||
31 | if(styles) { | 50 | if(styles) { |
32 | this.application.ninja.stylesController.setElementStyles(el, styles); | 51 | this.application.ninja.stylesController.setElementStyles(el, styles); |
33 | } | 52 | } |
53 | */ | ||
34 | } | 54 | } |
35 | }, | 55 | }, |
36 | 56 | ||
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js index da8cbb76..d166467c 100755 --- a/js/mediators/element-mediator.js +++ b/js/mediators/element-mediator.js | |||
@@ -522,9 +522,9 @@ exports.ElementMediator = Montage.create(Component, { | |||
522 | length = layersDraggedArray.length; | 522 | length = layersDraggedArray.length; |
523 | 523 | ||
524 | for(var i=0; documentRoot.children[i]; i++) { | 524 | for(var i=0; documentRoot.children[i]; i++) { |
525 | if(documentRoot.children[i] === layerDroppedAfter.layerData.elementsList[0]) { | 525 | if(documentRoot.children[i] === layerDroppedAfter.layerData.stageElement) { |
526 | if(length >0){ | 526 | if(length >0){ |
527 | documentRoot.children[i].parentNode.insertBefore(layersDraggedArray[length-1].layerData.elementsList[0], documentRoot.children[i]); | 527 | documentRoot.children[i].parentNode.insertBefore(layersDraggedArray[length-1].layerData.stageElement, documentRoot.children[i]); |
528 | } | 528 | } |
529 | 529 | ||
530 | /* Will require for Multiple Drag n Drop */ | 530 | /* Will require for Multiple Drag n Drop */ |
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index 88314c8b..9c8d4434 100644 --- a/js/panels/Timeline/Collapser.js +++ b/js/panels/Timeline/Collapser.js | |||
@@ -151,7 +151,6 @@ var Montage = require("montage/core/core").Montage, | |||
151 | 151 | ||
152 | // isToggling: Bindable property. Set this (to anything) to trigger a toggle. | 152 | // isToggling: Bindable property. Set this (to anything) to trigger a toggle. |
153 | _isToggling: { | 153 | _isToggling: { |
154 | serializable: true, | ||
155 | value: true | 154 | value: true |
156 | }, | 155 | }, |
157 | isToggling: { | 156 | isToggling: { |
@@ -179,7 +178,6 @@ var Montage = require("montage/core/core").Montage, | |||
179 | 178 | ||
180 | prepareForDraw: { | 179 | prepareForDraw: { |
181 | value: function() { | 180 | value: function() { |
182 | |||
183 | // Get the original value of the overflow property: | 181 | // Get the original value of the overflow property: |
184 | this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow"); | 182 | this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow"); |
185 | if (this.isCollapsed === false) { | 183 | if (this.isCollapsed === false) { |
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index 859cdfb1..b91027b6 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js | |||
@@ -31,24 +31,32 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
31 | prepareForDraw:{ | 31 | prepareForDraw:{ |
32 | value:function(){ | 32 | value:function(){ |
33 | this.element.addEventListener("click", this, false); | 33 | this.element.addEventListener("click", this, false); |
34 | |||
35 | // Drag and drop event handlers | ||
36 | this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false); | ||
37 | this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false); | ||
38 | this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false); | ||
39 | this.element.addEventListener("dragend", this.handleDragend.bind(this), false); | ||
34 | } | 40 | } |
35 | }, | 41 | }, |
36 | 42 | ||
37 | draw:{ | 43 | draw:{ |
38 | value:function(){ | 44 | value:function(){ |
39 | this.element.style.left = (this.position - 3) + "px"; | 45 | this.element.style.left = (this.position - 5) + "px"; |
40 | } | 46 | } |
41 | }, | 47 | }, |
42 | 48 | ||
43 | deselectKeyframe:{ | 49 | deselectKeyframe:{ |
44 | value:function(){ | 50 | value:function(){ |
45 | this.element.classList.remove("keyframeSelected"); | 51 | this.element.classList.remove("keyframeSelected"); |
52 | this.element.style.left = (this.position - 5) + "px"; | ||
46 | } | 53 | } |
47 | }, | 54 | }, |
48 | 55 | ||
49 | selectKeyframe:{ | 56 | selectKeyframe:{ |
50 | value:function(){ | 57 | value:function(){ |
51 | this.element.classList.add("keyframeSelected"); | 58 | this.element.classList.add("keyframeSelected"); |
59 | this.element.style.left = (this.position - 6) + "px"; | ||
52 | this.parentComponent.selectTween(); | 60 | this.parentComponent.selectTween(); |
53 |