Merge branch 'refs/heads/Ninja-Internal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 0 insertions, 51 deletions

diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
deleted file mode 100755
index 3f5b87e1..00000000
--- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* <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;
-var Component = require("montage/ui/component").Component;
-
-exports.BreadcrumbButton = Montage.create(Component, {
-
-    button: {
-        value: null
-    },
-
-    data: {
-        value: null
-    },
-
-    prepareForDraw: {
-        value: function() {
-            this.element.addEventListener("mousedown", this, false);
-        }
-    },
-
-    draw: {
-        value: function() {
-            if(this.data.element.id === "UserContent") {
-                this.button.innerHTML = "Body";
-            } else {
-                this.button.innerHTML = this.data.element.nodeName;
-            }
-        }
-    },
-
-    handleMousedown: {
-        value: function(event) {
-
-             //this.data.selected=true;
-             NJevent('breadCrumbTrail',this.data);
-             //this.data.selected=false;
-
-        }
-    }
-
-
-
-
-
-
-}); 
\ No newline at end of file