Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

39 files changed, 4249 insertions, 1598 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, {
         },
         set: function(str) {
             var node = this._getFirstTextNode();
-            node.textContent = str;
+            if (node.textContent !== str) {
+                node.textContent = str;
+            }
+            
+            //node.innerText = str;
         }
     },
 
@@ -331,4 +335,4 @@ exports.Hintable = Montage.create(Editable, {
         distinct: true
     }
     
-});
\ No newline at end of file
+});
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, {
         
                 if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
                 
-            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.currentDocument.model.domContainer.appendChild(el);
-                } else {
-                    var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];
+                // Updated to use new methods in TimelinePanel. JR.
+                var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
+                if (insertionIndex === false) {
+                        this.application.ninja.currentDocument.model.domContainer.appendChild(el);
+                } else {
+                        if (insertionIndex === 0) {
+                                this.application.ninja.currentDocument.model.domContainer.appendChild(el);
+                        } else {
+                    var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement;
                     element.parentNode.insertBefore(el, element.nextSibling);
-                }
-            } else {
-                this.application.ninja.currentDocument.model.domContainer.appendChild(el);
-            }
-
+                        }
+                }
+                
             if(styles) {
                 this.application.ninja.stylesController.setElementStyles(el, styles);
             }
@@ -83,24 +83,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");
@@ -132,7 +132,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/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 017ed20a..ca7aadaf 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -1,42 +1,42 @@
 /* <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> */
+ 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;
 
 var ElementController = require("js/controllers/elements/element-controller").ElementController,
-    Command     =   require("js/controllers/undo-controller").Command,
+    Command = require("js/controllers/undo-controller").Command,
     NJUtils = require("js/lib/NJUtils").NJUtils;
 
 exports.ElementMediator = Montage.create(Component, {
 
-    addDelegate: {
-        enumerable: false,
-        value: null
+    addDelegate:{
+        enumerable:false,
+        value:null
     },
 
-    deleteDelegate: {
-        enumerable: false,
-        value: null
+    deleteDelegate:{
+        enumerable:false,
+        value:null
     },
 
-    addElements: {
-        value: function(elements, rules, notify) {
+    addElements:{
+        value:function (elements, rules, notify) {