aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-24 08:29:30 -0700
committerPushkar Joshi2012-04-24 08:29:30 -0700
commite7bbd9b08b4cd87530596b370366d994ca766650 (patch)
tree8862827848c55b36cc2e2bc0bb0c07a5e50dc1ca /js/components/layout
parentf57727d36709bbda03b45788dc12faf31a591b40 (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-e7bbd9b08b4cd87530596b370366d994ca766650.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/layout')
-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 f35972b6..597577f1 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -63,16 +63,27 @@ exports.Breadcrumb = Montage.create(Component, {
63 63
64 parentNode = this.container; 64 parentNode = this.container;
65 65
66 while(parentNode.id !== "UserContent") { 66 // This is for the old template support.
67 // TODO: Remove marker for old template: NINJA-STAGE-REWORK
68 if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
69 while(parentNode.id !== "UserContent") {
70 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
71 parentNode = parentNode.parentNode;
72 }
73
74 // This is always the top container which is now hardcoded to body
75 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
76 } else {
77 while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
78 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
79 parentNode = parentNode.parentNode;
80 }
81
82 // This is always the top container which is now hardcoded to body
67 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); 83 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
68 parentNode = parentNode.parentNode; 84 console.log("this works!");
69 } 85 }
70 86
71 // This is always the top container which is now hardcoded to body
72 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
73
74
75
76 } 87 }
77 }, 88 },
78 89