aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--js/components/hintable.reel/hintable.js8
-rwxr-xr-xjs/controllers/elements/element-controller.js38
-rwxr-xr-xjs/controllers/elements/element-controller.js.orig393
-rwxr-xr-xjs/document/_toDelete/html-document.js873
-rwxr-xr-xjs/mediators/element-mediator.js56
-rwxr-xr-xjs/mediators/keyboard-mediator.js7
-rw-r--r--js/panels/Timeline/Collapser.js2
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.html35
-rw-r--r--js/panels/Timeline/EasingMenu.reel/EasingMenu.js180
-rw-r--r--js/panels/Timeline/EasingMenu.reel/css/EasingMenu.css86
-rw-r--r--js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss85
-rw-r--r--js/panels/Timeline/EasingMenu.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js74
-rw-r--r--js/panels/Timeline/Keyframe.reel/css/Keyframe.css11
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html147
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js668
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js.orig1057
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css78
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss14
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html40
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js474
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css11
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/.sass-cache/a26ed2cbe268f8c721d1b1d8dfa075c8c5b47e72/PropertyTrack.scsscbin0 -> 5151 bytes
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss8
-rw-r--r--js/panels/Timeline/Span.reel/Span.html10
-rw-r--r--js/panels/Timeline/Span.reel/Span.js175
-rw-r--r--js/panels/Timeline/Span.reel/css/Span.css65
-rw-r--r--js/panels/Timeline/Span.reel/scss/Span.scss65
-rw-r--r--js/panels/Timeline/Span.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/Style.reel/Style.html7
-rw-r--r--js/panels/Timeline/Style.reel/Style.js711
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css91
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss11
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html9
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1282
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css24
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss3
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html104
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js549
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css18
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss2
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js147
-rwxr-xr-xjs/panels/properties.reel/properties.js1
44 files changed, 6214 insertions, 1425 deletions
diff --git a/.gitignore b/.gitignore
index 42e99c16..10388811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cl
23scss/.sass-cache/ 23scss/.sass-cache/
24js/helper-classes/RDGE/src/tools/compiler.jar 24js/helper-classes/RDGE/src/tools/compiler.jar
25js/panels/Timeline/TimelinePanel.reel/scss/compass_app_log.txt 25js/panels/Timeline/TimelinePanel.reel/scss/compass_app_log.txt
26
27.sass-cachejs/panels/Timeline/Span.reel/scss/compass_app_log.txt
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 e40a646a..fcb121ee 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.currentDocument.model.domContainer.appendChild(el);
22 } else {
23 if (insertionIndex === 0) {
24 this.application.ninja.currentDocument.model.domContainer.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.currentDocument.model.domContainer.appendChild(el); 41 this.application.ninja.currentDocument.model.domContainer.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
@@ -83,24 +103,24 @@ exports.ElementController = Montage.create(Component, {
83 103
84 // Return cached value if one exists 104 // Return cached value if one exists
85 if(isFill) { 105 if(isFill) {
86 if(el.elementModel.fill) { 106// if(el.elementModel.fill) {
87 return el.elementModel.fill; 107// return el.elementModel.fill;
88 } 108// }
89 //TODO: Once logic for color and gradient is established, this needs to be revised 109 //TODO: Once logic for color and gradient is established, this needs to be revised
90 color = this.getProperty(el, "background-color"); 110 color = this.getProperty(el, "background-color");
91 image = this.getProperty(el, "background-image"); 111 image = this.getProperty(el, "background-image");
92 } else { 112 } else {
93 // Try getting border color from specific side first 113 // Try getting border color from specific side first
94 if(borderSide) { 114 if(borderSide) {
95 color = this.getProperty(el, "border-" + borderSide + "-color"); 115 color = this.getProperty(el, "border-" + borderSide + "-color",true);
96 image = this.getProperty(el, "border-" + borderSide + "-image"); 116 image = this.getProperty(el, "border-" + borderSide + "-image");
97 } 117 }
98 118
99 // If no color was found, look up the shared border color 119 // If no color was found, look up the shared border color
100 if(!color && !image) { 120 if(!color && !image) {
101 if(el.elementModel.stroke) { 121// if(el.elementModel.stroke) {
102 return el.elementModel.stroke; 122// return el.elementModel.stroke;
103 } 123// }
104 124
105 color = this.getProperty(el, "border-color"); 125 color = this.getProperty(el, "border-color");
106 image = this.getProperty(el, "border-image"); 126 image = this.getProperty(el, "border-image");
@@ -132,7 +152,7 @@ exports.ElementController = Montage.create(Component, {
132 }, 152 },
133 153
134 setColor: { 154 setColor: {
135 value: function(el, color, isFill) { 155 value: function(el, color, isFill,borderSide) {
136 var mode = color.mode; 156 var mode = color.mode;
137 157
138 if(isFill) { 158 if(isFill) {
diff --git a/js/controllers/elements/element-controller.js.orig b/js/controllers/elements/element-controller.js.orig
new file mode 100755
index 00000000..bf631d61
--- /dev/null
+++ b/js/controllers/elements/element-controller.js.orig
@@ -0,0 +1,393 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7var Montage = require("montage/core/core").Montage,