2 files changed, 401 insertions, 8 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 280090d1..3d71c52d 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -103,24 +103,24 @@ exports.ElementController = Montage.create(Component, {
 
             // Return cached value if one exists
             if(isFill) {
-                if(el.elementModel.fill) {
-                    return el.elementModel.fill;
-                }
+//                if(el.elementModel.fill) {
+//                    return el.elementModel.fill;
+//                }
                 //TODO: Once logic for color and gradient is established, this needs to be revised
                 color = this.getProperty(el, "background-color");
                 image = this.getProperty(el, "background-image");
             } else {
                 // Try getting border color from specific side first
                 if(borderSide) {
-                    color = this.getProperty(el, "border-" + borderSide + "-color");
+                    color = this.getProperty(el, "border-" + borderSide + "-color",true);
                     image = this.getProperty(el, "border-" + borderSide + "-image");
                 }
 
                 // If no color was found, look up the shared border color
                 if(!color && !image) {
-                    if(el.elementModel.stroke) {
-                        return el.elementModel.stroke;
-                    }
+//                    if(el.elementModel.stroke) {
+//                        return el.elementModel.stroke;
+//                    }
 
                     color = this.getProperty(el, "border-color");
                     image = this.getProperty(el, "border-image");
@@ -152,7 +152,7 @@ exports.ElementController = Montage.create(Component, {
     },
 
     setColor: {
-        value: function(el, color, isFill) {
+        value: function(el, color, isFill,borderSide) {
             var mode = color.mode;
 
             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 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component,
+    njModule = require("js/lib/NJUtils");
+
+exports.ElementController = Montage.create(Component, {
+
+    addElement: {
+        value: function(el, styles) {
+        
+                if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
+                
+                // Updated to use new methods in TimelinePanel. JR.
+                var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
+                if (insertionIndex === false) {
+                        this.application.ninja.currentSelectedContainer.appendChild(el);
+                } else {
+                        if (insertionIndex === 0) {
+                                this.application.ninja.currentSelectedContainer.appendChild(el);
+                        } else {
+                    var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement;
+                    element.parentNode.insertBefore(el, element.nextSibling);
+                        }
+                }
+                
+            if(styles) {
+                this.application.ninja.stylesController.setElementStyles(el, styles);
+            }
+                
+                /*
+                        // Old methods. Kept for reference. Delete if not needed. JR.
+            if(this.application.ninja.timeline.currentLayerSelected) {
+                var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
+
+                if(selectedLayerIndex === 0) {
+                    this.application.ninja.currentSelectedContainer.appendChild(el);
+                } else {
+                    var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.stageElement;
+                    element.parentNode.insertBefore(el, element.nextSibling);
+                }
+            } else {
+                this.application.ninja.currentSelectedContainer.appendChild(el);
+            }
+
+            if(styles) {
+                this.application.ninja.stylesController.setElementStyles(el, styles);
+            }
+            */
+        }
+    },
+
+    // Remove the element from the DOM and clear the GLWord.
+    removeElement: {
+        value: function(el) {
+            if(el.elementModel.shapeModel && el.elementModel.shapeModel.GLWorld) {
+                el.elementModel.shapeModel.GLWorld.clearTree();
+            }
+            el.parentNode.removeChild(el);
+        }
+    },
+    
+    getProperty: {
+        value: function(el, prop, fallbackOnComputed, isStageElement) {
+            if(el.nodeType !== 3){
+                return this.application.ninja.stylesController.getElementStyle(el, prop, fallbackOnComputed, isStageElement);
+            }else{
+                return null;
+            }
+        }
+    },
+
+    setProperty: {
+        value: function(el, p, value) {
+            this.application.ninja.stylesController.setElementStyle(el, p, value);
+        }
+    },
+
+    setProperties: {
+        value: function(element, properties) {
+            for(var property in properties) {
+                this.application.ninja.stylesController.setElementStyle(element, property, properties[property]);
+        }
+        }
+    },
+
+    setAttribute: {
+        value: function(el, att, value) {
+            el.setAttribute(att, value);
+        }
+    },
+
+    //--------------------------------------------------------------------------------------------------------
+    // Routines to get/set color properties
+    // borderSide : "top", "right", "bottom", or "left"
+    getColor: {
+        value: function(el, isFill, borderSide) {
+            var colorObj, color, image;
+
+            // Return cached value if one exists
+            if(isFill) {
+//                if(el.elementModel.fill) {
+//                    return el.elementModel.fill;
+//                }
+                //TODO: Once logic for color and gradient is established, this needs to be revised
+                color = this.getProperty(el, "background-color");
+                image = this.getProperty(el, "background-image");
+            } else {
+                // Try getting border color from specific side first
+                if(borderSide) {
+                    color = this.getProperty(el, "border-" + borderSide + "-color",true);
+                    image = this.getProperty(el, "border-" + borderSide + "-image");
+                }
+
+                // If no color was found, look up the shared border color
+                if(!color && !image) {
+//                    if(el.elementModel.stroke) {
+//                        return el.elementModel.stroke;
+//                    }
+
+                    color = this.getProperty(el, "border-color");
+                    image = this.getProperty(el, "border-image");
+                }
+            }
+
+            if(color || image) {
+                if (image && image !== 'none' && image.indexOf('-webkit') >= 0) {
+                    //Gradient
+                    colorObj = this.application.ninja.colorController.getColorObjFromCss(image);
+                } else {
+                    //Solid
+                    colorObj = this.application.ninja.colorController.getColorObjFromCss(color);
+                }
+            }
+
+            // Update cache
+            if(isFill) {
+                el.elementModel.fill = colorObj;
+            } else if(!borderSide) {
+                // TODO - Need to update border style and width also
+                el.elementModel.stroke = colorObj;
+            } else {
+                // TODO - Should update specific border sides too
+            }
+
+            return colorObj;
+        }
+    },
+
+    setColor: {
+        value: function(el, color, isFill,borderSide) {
+            var mode = color.mode;
+
+            if(isFill) {
+                if(mode) {
+                    switch (mode) {
+                        case 'nocolor':
+                            this.setProperty(el, "background-image", "none");