aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJonathan Duran2012-04-24 08:49:52 -0700
committerJonathan Duran2012-04-24 08:49:52 -0700
commit02414d5b25a53f7939d77c83ed550aad41e1f382 (patch)
treed918b1a78a44bddb55676d767069016db9fcda18 /js/components
parent47488a6ff1b7fc32e2485b3dd82afe207b936b35 (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-02414d5b25a53f7939d77c83ed550aad41e1f382.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js25
1 files changed, 18 insertions, 7 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index f3eedfd0..ea7238fc 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -64,16 +64,27 @@ exports.Breadcrumb = Montage.create(Component, {
64 64
65 parentNode = this.container; 65 parentNode = this.container;
66 66
67 while(parentNode.id !== "UserContent") { 67 // This is for the old template support.
68 // TODO: Remove marker for old template: NINJA-STAGE-REWORK
69 if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
70 while(parentNode.id !== "UserContent") {
71 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
72 parentNode = parentNode.parentNode;
73 }
74
75 // This is always the top container which is now hardcoded to body
76 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
77 } else {
78 while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
79 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
80 parentNode = parentNode.parentNode;
81 }
82
83 // This is always the top container which is now hardcoded to body
68 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); 84 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
69 parentNode = parentNode.parentNode; 85 console.log("this works!");
70 } 86 }
71 87
72 // This is always the top container which is now hardcoded to body
73 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
74// NJevent("breadCrumbBinding",this)
75
76
77 } 88 }
78 }, 89 },
79 90