diff options
author | hwc487 | 2012-04-24 09:54:34 -0700 |
---|---|---|
committer | hwc487 | 2012-04-24 09:54:34 -0700 |
commit | 9d274a93cecc7cba543d27237e65425b2d6a393c (patch) | |
tree | ab26a25c360642e48ad27041fc270cae12cb6128 /js/components | |
parent | 27c1ba250a7db26cf24dd456d20af9ff1649e638 (diff) | |
parent | 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff) | |
download | ninja-9d274a93cecc7cba543d27237e65425b2d6a393c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Canvas-interaction
Diffstat (limited to 'js/components')
-rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 25 |
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 | ||