aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-21 09:55:25 -0700
committerJose Antonio Marquez2012-06-21 09:55:25 -0700
commitd9f2064fc7dc5284e159032e3efbab5de9b2dc14 (patch)
treef648fa7842f3dc6011da08aaab0bedb445d43b58 /js/controllers
parent313a62245400e6c8cfa6d2f02c603cc7f01ddfc6 (diff)
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
downloadninja-d9f2064fc7dc5284e159032e3efbab5de9b2dc14.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/elements/element-controller.js40
1 files changed, 20 insertions, 20 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index e40a646a..1e05b09b 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -15,19 +15,19 @@ 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 if(this.application.ninja.timeline.currentLayerSelected) { 18 // Updated to use new methods in TimelinePanel. JR.
19 var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID); 19 var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
20 20 if (insertionIndex === false) {
21 if(selectedLayerIndex === 0) { 21 this.application.ninja.currentDocument.model.domContainer.appendChild(el);
22 this.application.ninja.currentDocument.model.domContainer.appendChild(el); 22 } else {
23 } else { 23 if (insertionIndex === 0) {
24 var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0]; 24 this.application.ninja.currentDocument.model.domContainer.appendChild(el);
25 } else {
26 var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement;
25 element.parentNode.insertBefore(el, element.nextSibling); 27 element.parentNode.insertBefore(el, element.nextSibling);
26 } 28 }
27 } else { 29 }
28 this.application.ninja.currentDocument.model.domContainer.appendChild(el); 30
29 }
30
31 if(styles) { 31 if(styles) {
32 this.application.ninja.stylesController.setElementStyles(el, styles); 32 this.application.ninja.stylesController.setElementStyles(el, styles);
33 } 33 }
@@ -83,24 +83,24 @@ exports.ElementController = Montage.create(Component, {
83 83
84 // Return cached value if one exists 84 // Return cached value if one exists
85 if(isFill) { 85 if(isFill) {
86 if(el.elementModel.fill) { 86// if(el.elementModel.fill) {
87 return el.elementModel.fill; 87// return el.elementModel.fill;
88 } 88// }
89 //TODO: Once logic for color and gradient is established, this needs to be revised 89 //TODO: Once logic for color and gradient is established, this needs to be revised
90 color = this.getProperty(el, "background-color"); 90 color = this.getProperty(el, "background-color");
91 image = this.getProperty(el, "background-image"); 91 image = this.getProperty(el, "background-image");
92 } else { 92 } else {
93 // Try getting border color from specific side first 93 // Try getting border color from specific side first
94 if(borderSide) { 94 if(borderSide) {
95 color = this.getProperty(el, "border-" + borderSide + "-color"); 95 color = this.getProperty(el, "border-" + borderSide + "-color",true);
96 image = this.getProperty(el, "border-" + borderSide + "-image"); 96 image = this.getProperty(el, "border-" + borderSide + "-image");
97 } 97 }
98 98
99 // If no color was found, look up the shared border color 99 // If no color was found, look up the shared border color
100 if(!color && !image) { 100 if(!color && !image) {
101 if(el.elementModel.stroke) { 101// if(el.elementModel.stroke) {
102 return el.elementModel.stroke; 102// return el.elementModel.stroke;
103 } 103// }
104 104
105 color = this.getProperty(el, "border-color"); 105 color = this.getProperty(el, "border-color");
106 image = this.getProperty(el, "border-image"); 106 image = this.getProperty(el, "border-image");
@@ -132,7 +132,7 @@ exports.ElementController = Montage.create(Component, {
132 }, 132 },
133 133
134 setColor: { 134 setColor: {
135 value: function(el, color, isFill) { 135 value: function(el, color, isFill,borderSide) {
136 var mode = color.mode; 136 var mode = color.mode;
137 137
138 if(isFill) { 138 if(isFill) {