From 0ca1910df1c78116139664bf39a95cf0ec7c8dc8 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 23 May 2012 15:35:15 -0700
Subject: adding document views checks for the timeline and breadcrumb
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
js/components/layout/bread-crumb.reel/bread-crumb.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/components/layout')
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index d2a6b1e4..aaefd923 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -21,7 +21,7 @@ exports.Breadcrumb = Montage.create(Component, {
handleCloseDocument: {
value: function(){
- if(!this.application.ninja.documentController.activeDocument) {
+ if(!this.application.ninja.documentController.activeDocument && this.application.ninja.currentDocument.currentView !== "code") {
this.disabled = true;
this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.documentRoot : null);
}
--
cgit v1.2.3
From 5914c5b2209c4b8daac4249bb76cda5c9314c4e6 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 24 May 2012 00:07:23 -0700
Subject: Cleaning up referencing to 'documentRoot' and '_document'
Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
---
js/components/layout/bread-crumb.reel/bread-crumb.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'js/components/layout')
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index d2a6b1e4..2db775eb 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -23,7 +23,7 @@ exports.Breadcrumb = Montage.create(Component, {
value: function(){
if(!this.application.ninja.documentController.activeDocument) {
this.disabled = true;
- this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.documentRoot : null);
+ this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.model.documentRoot : null);
}
}
},
@@ -65,7 +65,7 @@ exports.Breadcrumb = Montage.create(Component, {
parentNode = this.container;
- while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
+ while(parentNode !== this.application.ninja.currentDocument.model.documentRoot) {
this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
parentNode = parentNode.parentNode;
}
--
cgit v1.2.3