aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorEric Guzman2012-05-29 15:29:11 -0700
committerEric Guzman2012-05-29 15:29:11 -0700
commit25ac55c285bb4850118c644dc57adaeda5b9a859 (patch)
treeb645941d7916716cbaf4860355df4101fc0f4c3c /js/components/layout
parent1fda3cea5f8dced1e14533969722e30b8ea1e6fa (diff)
parent58e454c828abf0b64fa62120359bcd78a0d34ac4 (diff)
downloadninja-25ac55c285bb4850118c644dc57adaeda5b9a859.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Diffstat (limited to 'js/components/layout')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index d2a6b1e4..49dbe3cb 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -21,9 +21,9 @@ exports.Breadcrumb = Montage.create(Component, {
21 21
22 handleCloseDocument: { 22 handleCloseDocument: {
23 value: function(){ 23 value: function(){
24 if(!this.application.ninja.documentController.activeDocument) { 24 if(!this.application.ninja.documentController.activeDocument && this.application.ninja.currentDocument.currentView !== "code") {
25 this.disabled = true; 25 this.disabled = true;
26 this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.documentRoot : null); 26 this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.model.documentRoot : null);
27 } 27 }
28 } 28 }
29 }, 29 },
@@ -65,7 +65,7 @@ exports.Breadcrumb = Montage.create(Component, {
65 65
66 parentNode = this.container; 66 parentNode = this.container;
67 67
68 while(parentNode !== this.application.ninja.currentDocument.documentRoot) { 68 while(parentNode !== this.application.ninja.currentDocument.model.documentRoot) {
69 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName}); 69 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
70 parentNode = parentNode.parentNode; 70 parentNode = parentNode.parentNode;
71 } 71 }