Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

13 files changed, 57 insertions, 2325 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
index 65e5b7c8..3f5b87e1 100755
--- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
+++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
@@ -7,45 +7,38 @@
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
-
 exports.BreadcrumbButton = Montage.create(Component, {
 
-    button:     { value: null },
+    button: {
+        value: null
+    },
 
-    data:       { value: null },
+    data: {
+        value: null
+    },
 
     prepareForDraw: {
-        enumerable: false,
         value: function() {
             this.element.addEventListener("mousedown", this, false);
         }
     },
 
     draw: {
-        enumerable: false,
         value: function() {
-
-        if(this.data.element.id==="UserContent"){
-
-           this.button.innerHTML = "Body";
-        }
-
-        else{
-           this.button.innerHTML=this.data.element.nodeName;
-        }
-
+            if(this.data.element.id === "UserContent") {
+                this.button.innerHTML = "Body";
+            } else {
+                this.button.innerHTML = this.data.element.nodeName;
+            }
         }
     },
 
     handleMousedown: {
         value: function(event) {
 
-            if(event.which===1){
-
-                 this.data.selected=true;
-                 NJevent('breadCrumbTrail',this.data);
-                 this.data.selected=false;
-            }
+             //this.data.selected=true;
+             NJevent('breadCrumbTrail',this.data);
+             //this.data.selected=false;
 
         }
     }
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index ead7c764..1290aaac 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -1,6 +1,6 @@
 
-var Montage = require("montage/core/core").Montage
-var Component = require("montage/ui/component").Component
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
 
 var Breadcrumb = exports.Breadcrumb = Montage.create(Component, {
 
@@ -8,15 +8,12 @@ var Breadcrumb = exports.Breadcrumb = Montage.create(Component, {
         value:null
     },
 
-
     container: {
         set: function(value) {
-          if(this._container !== value) {
-              this._container = value;
-              this.createContainerElements();
-          }
-
-
+            if(this._container !== value) {
+                this._container = value;
+                this.createContainerElements();
+            }
         },
         get: function() {
             return this._container;
@@ -25,7 +22,6 @@ var Breadcrumb = exports.Breadcrumb = Montage.create(Component, {
 
     containerElements: {
         value: []
-
     },
 
 
@@ -33,14 +29,12 @@ var Breadcrumb = exports.Breadcrumb = Montage.create(Component, {
         value: function() {
             this.eventManager.addEventListener( "appLoaded", this, false);
             this.eventManager.addEventListener( "breadCrumbTrail", this, false);
-        },
-        enumerable : false
+        }
     },
 
     handleAppLoaded : {
         value: function() {
 
-
             Object.defineBinding(this, "container", {
                     boundObject: this.application.ninja,
                     boundObjectPropertyPath: "currentSelectedContainer",
@@ -50,107 +44,61 @@ var Breadcrumb = exports.Breadcrumb = Montage.create(Component, {
         }
     },
 
-    prepareForDraw: {
-        value: function() {
-
-        }
-    },
-
-    draw: {
-        value: function() {
-
-        }
-    },
-
-    didDraw:{
-        value:function(){
-        }
-    },
-
     createContainerElements: {
         value: function() {
-
             var parentNode;
 
-            while(this.containerElements.pop()){
-              // To empty the array to get the new parentNode of the new currentLevel
-            }
-
-            if(this.container.id === "UserContent"){
-
-                this.containerElements.push({selected:false,element:this.container});
-
+            this.containerElements.length = 0
 
-            }
-            else{
-
-               parentNode= this.container;
-
-                  while(parentNode.id!=="UserContent"){
-
-                      this.containerElements.unshift ({selected:false,element:parentNode});
-                      parentNode=parentNode.parentNode;
+            if(this.container.id === "UserContent") {
+                this.containerElements.push({selected:false, element:this.container});
+            } else {
+                parentNode = this.container;
 
-                  }
-
-               this.containerElements.unshift({selected:false,element:parentNode});
+                while(parentNode.id!=="UserContent") {
+                    this.containerElements.unshift({selected:false,element:parentNode});
+                    parentNode = parentNode.parentNode;
+                }