-
--
cgit v1.2.3
From 919a0d0ed35c24b1047281723ddde2ac98fc9a3e Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 15 May 2012 22:36:44 -0700
Subject: document close handler. initial working draft
Signed-off-by: Valerio Virgillito
---
js/components/layout/document-entry.reel/document-entry.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/components/layout')
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 81a63c90..4d09a362 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -117,7 +117,7 @@ exports.DocumentEntry = Montage.create(Component, {
handleClick: {
value: function(event) {
if(event._event.target.nodeName === "IMG") {
- this.application.ninja.documentController.closeDocument(this._uuid);
+ this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
} else {
if(!this._document.isActive) {
this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
--
cgit v1.2.3
From 2c9ed2068b12884fc026fe3a7b57021e7e591f1c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 16 May 2012 16:04:22 -0700
Subject: fixing a null value for the document entry bar
Signed-off-by: Valerio Virgillito
---
js/components/layout/document-entry.reel/document-entry.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'js/components/layout')
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 4d09a362..ad0236c6 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -33,8 +33,10 @@ exports.DocumentEntry = Montage.create(Component, {
}
this._document = value;
- this._uuid = value.uuid;
- //this.needsDraw = true;
+
+ if(value) {
+ this._uuid = value.uuid;
+ }
}
},
--
cgit v1.2.3
From b97570f5daff9d0c40f274c2c29a457079da1c1a Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 17 May 2012 12:23:31 -0700
Subject: fixing the breadcrumb
Signed-off-by: Valerio Virgillito
---
.../layout/bread-crumb.reel/bread-crumb.html | 37 ++++++++--------------
.../layout/bread-crumb.reel/bread-crumb.js | 24 ++++----------
2 files changed, 19 insertions(+), 42 deletions(-)
(limited to 'js/components/layout')
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index ae3e2022..0dabc781 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -32,30 +32,23 @@
}
],
"bindings": {
- "label": {
- "boundObject": {"@": "repetition1"},
- "boundObjectPropertyPath": "objectAtCurrentIteration.label",
- "oneway": true
- },
- "value": {
- "boundObject": {"@": "repetition1"},
- "boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid",
- "oneway": true
- }
+ "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
+ "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
+ }
+ },
+
+ "buttonsListController": {
+ "prototype": "montage/ui/controller/array-controller",
+ "bindings": {
+ "content": {"<<->": "@owner.containerElements"}
}
},
- "repetition1": {
+ "buttonsList": {
"prototype": "montage/ui/repetition.reel",
"properties": {
- "element": {"#": "breadcrumb_container"}
- },
- "bindings": {
- "objects": {
- "boundObject": {"@": "owner"},
- "boundObjectPropertyPath": "containerElements",
- "oneway": true
- }
+ "element": {"#": "breadcrumb_container"},
+ "contentController": {"@": "buttonsListController"}
}
},
@@ -65,11 +58,7 @@
"element": {"#": "disabledCondition"}
},
"bindings": {
- "condition": {
- "boundObject": {"@": "owner"},
- "boundObjectPropertyPath": "disabled",
- "oneway": true
- }
+ "condition": {"<-": "@owner.disabled"}
}
}
}
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index c1b021a3..d2a6b1e4 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -60,30 +60,18 @@ exports.Breadcrumb = Montage.create(Component, {
value: function() {
var parentNode;
- this.containerElements.length = 0;
+// delete this.containerElements;
+ this.containerElements = [];
parentNode = this.container;
- // This is for the old template support.
- // TODO: Remove marker for old template: NINJA-STAGE-REWORK
- if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
- while(parentNode.id !== "UserContent") {
- this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
- parentNode = parentNode.parentNode;
- }
-
- // This is always the top container which is now hardcoded to body
- this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
- } else {
- while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
- this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
- parentNode = parentNode.parentNode;
- }
-
- // This is always the top container which is now hardcoded to body
+ while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+ parentNode = parentNode.parentNode;
}
+ // This is always the top container which is now hardcoded to body
+ this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
}
},
--
cgit v1.2.3