21 files changed, 227 insertions, 180 deletions

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 65410543..b82784d3 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -148,16 +148,12 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
             data = htmlData ? htmlData : textData;
 
             if (data && data.length) {
-                //deselect current selections
-                this.application.ninja.selectedElements.length = 0;
-                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": true} );
-
                 divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument);
                 this.application.ninja.elementMediator.addElements(divWrapper, {"height": "68px",
                                                                                 "left": "0px",
                                                                                 "position": "absolute",
                                                                                 "top": "0px",
-                                                                                "width": "161px"}, false);
+                                                                                "width": "161px"}, false/*notify*/, false/*callAddDelegate*/);
 
                 divWrapper.innerHTML = data;
 
diff --git a/js/components/converter/node-name-converter.js b/js/components/converter/node-name-converter.js
new file mode 100644
index 00000000..fdca06e5
--- /dev/null
+++ b/js/components/converter/node-name-converter.js
@@ -0,0 +1,54 @@
+/* <copyright>
+Copyright (c) 2012, Motorola Mobility LLC.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
+var Montage = require("montage").Montage,
+    Converter = require("montage/core/converter/converter").Converter;
+
+exports.NodeNameConverter = Montage.create(Converter, {
+
+    convert: {
+        value: function(value) {
+            if(value) {
+                if(value.toLowerCase() === "ninja-content") {
+                    value = "DIV";
+                }
+
+                return value;
+            }
+        }
+    },
+
+    revert: {
+        value: function(value) {
+            return value;
+        }
+    }
+
+});
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 2c6d941f..2fff245c 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -44,13 +44,17 @@ POSSIBILITY OF SUCH DAMAGE.
                     }
                 },
 
+                "nodeNameConverter": {
+                    "prototype": "js/components/converter/node-name-converter"
+                },
+
                 "breadcrumbButton": {
                     "prototype": "js/components/layout/bread-crumb-button.reel",
                     "properties": {
                         "element": {"#": "breadcrumbButton"}
                     },
                     "bindings": {
-                        "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
+                        "label": {"<-": "@buttonsList.objectAtCurrentIteration.label", "converter": {"@": "nodeNameConverter"}},
                         "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
                     }
                 },
diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index c3543c95..3eba1bec 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -82,16 +82,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused except the copy menu button
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.copy(clipboardEvent);
             }
@@ -106,16 +101,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.cut(clipboardEvent);
             }
@@ -137,16 +127,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             //TODO: return if stage is not focussed
 
             if(this.clipboardContext === "stage"){
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 1d945066..6dabff47 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -841,10 +841,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                                         child.strokeMat = "Linear Gradient";