-
--
cgit v1.2.3
From f6f722feecf88c8afe59327eaf8557ce4012abc7 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 10 May 2012 22:40:02 -0700
Subject: Fixing the dirty document flag. Disabling the stylesheets dirty flag
because === true on document open.
Signed-off-by: Valerio Virgillito
---
.../layout/documents-tab.reel/documents-tab.html | 24 ++++------------------
1 file changed, 4 insertions(+), 20 deletions(-)
(limited to 'js/components/layout')
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index cf3dbbf5..304c8871 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -26,26 +26,10 @@
"element": {"#": "document"}
},
"bindings": {
- "document": {
- "boundObject": {"@": "repetition1"},
- "boundObjectPropertyPath": "objectAtCurrentIteration",
- "oneway": true
- },
- "name": {
- "boundObject": {"@": "repetition1"},
- "boundObjectPropertyPath": "objectAtCurrentIteration.model.file.name",
- "oneway": true
- },
- "saveFlag": {
- "boundObject": {"@": "repetition1"},
- "boundObjectPropertyPath": "objectAtCurrentIteration.model.needsSave",
- "oneway": true
- },
- "active": {
- "boundObject": {"@": "repetition1"},
- "boundObjectPropertyPath": "objectAtCurrentIteration.model.isActive",
- "oneway": true
- }
+ "document": {"<-": "@repetition1.objectAtCurrentIteration"},
+ "name": {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"},
+ "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"},
+ "active": {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"}
}
},
--
cgit v1.2.3
From ba5b8238784a41099d0eb76795de2a7e5abde226 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 14 May 2012 13:44:27 -0700
Subject: code cleanup
Signed-off-by: Valerio Virgillito
---
js/components/layout/document-entry.reel/document-entry.js | 2 --
1 file changed, 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 9e4110e2..81a63c90 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -7,8 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
var Montage = require("montage/core/core").Montage;
var Component = require("montage/ui/component").Component;
-//var documentManagerModule = ("js/document/documentManager");
-
exports.DocumentEntry = Montage.create(Component, {
dirty: { value: null },
--
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
From 7a94696e19b14e15261df516e2ba75e693b1313d Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 18 May 2012 00:21:56 -0700
Subject: enabling basic document switching
Signed-off-by: Valerio Virgillito
---
js/components/layout/document-entry.reel/document-entry.js | 4 ++--
1 file changed, 2 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 ad0236c6..50b3624c 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -121,8 +121,8 @@ exports.DocumentEntry = Montage.create(Component, {
if(event._event.target.nodeName === "IMG") {
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));
+ if(!this.active) {
+ this.application.ninja.documentController.switchDocuments(this.application.ninja.currentDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
}
}
}
--
cgit v1.2.3
From 8247cddcc7ddce25a6282e97d304cad9a0f0c4f3 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 18 May 2012 01:06:31 -0700
Subject: fixed the shape subtool not refreshing the icon
Signed-off-by: Valerio Virgillito
---
js/components/layout/tool-button.reel/tool-button.html | 4 ++++
js/components/layout/tool-button.reel/tool-button.js | 11 -----------
js/components/layout/tools-list.reel/tools-list.html | 12 ++----------
3 files changed, 6 insertions(+), 21 deletions(-)
(limited to 'js/components/layout')
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 84a6d34e..a329f646 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -16,6 +16,10 @@
"prototype": "js/components/layout/tool-button.reel",
"properties": {
"element": {"#": "toolBarButton"}
+ },
+ "bindings": {
+ "selected": {"<<->": "@owner.data.selected"},
+ "subselected": {"<-": "@owner.data.subtools.selected"}
}
}
}
diff --git a/js/components/layout/tool-button.reel/tool-button.js b/js/components/layout/tool-button.reel/tool-button.js
index 6cea0dc3..6008c4ec 100755
--- a/js/components/layout/tool-button.reel/tool-button.js
+++ b/js/components/layout/tool-button.reel/tool-button.js
@@ -48,19 +48,8 @@ exports.ToolButton = Montage.create(Component, {
this.element.addEventListener("mousedown", this, false);
this.element.addEventListener("dblclick", this, false);
- Object.defineBinding(this, "selected", {
- boundObject: this.data,
- boundObjectPropertyPath: "selected",
- oneway: false
- });
-
if(this.data.container) {
this.element.title = this.data.subtools[this._subselected].toolTip;
- Object.defineBinding(this, "subselected", {
- boundObject: this.data.subtools,
- boundObjectPropertyPath: "selected",
- oneway: true
- });
}
this.element.classList.add(this.data.id)
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index d5c33624..df603bf8 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -16,11 +16,7 @@
"element": {"#": "toolbutton"}
},
"bindings": {
- "data": {
- "boundObject": {"@": "repetition1"},
- "boundObjectPropertyPath": "objectAtCurrentIteration",
- "oneway": true
- }
+ "data": {"<-": "@repetition1.objectAtCurrentIteration"}
}
},
@@ -30,11 +26,7 @@
"element": {"#": "groupLine"}
},
"bindings": {
- "condition": {
- "boundObject": {"@": "repetition1"},
- "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
- "oneway": true
- }
+ "condition": {"<-": "@repetition1.objectAtCurrentIteration.lastInGroup"}
}
},
--
cgit v1.2.3
From 2cc8e58f6bb9f64a7473e62aecd013fa55167231 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 21 May 2012 16:42:26 -0700
Subject: - added opening multiple code and design view documents - switching
between multiple code and design view documents - Note: closing of documents,
when multiple documents are open, is not yet implemented
Signed-off-by: Ananya Sen
---
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 50b3624c..24c7737c 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -122,7 +122,7 @@ exports.DocumentEntry = Montage.create(Component, {
this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
} else {
if(!this.active) {
- this.application.ninja.documentController.switchDocuments(this.application.ninja.currentDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
+ this.application.ninja.documentController.switchDocuments(this.application.ninja.documentController.activeDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
}
}
}
--
cgit v1.2.3
From 9b6da637d9654727426c6d78f17e3804bbd84ce5 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 22 May 2012 14:42:43 -0700
Subject: fixing a few document switching issues.
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 24c7737c..50b3624c 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -122,7 +122,7 @@ exports.DocumentEntry = Montage.create(Component, {
this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
} else {
if(!this.active) {
- this.application.ninja.documentController.switchDocuments(this.application.ninja.documentController.activeDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
+ this.application.ninja.documentController.switchDocuments(this.application.ninja.currentDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
}
}
}
--
cgit v1.2.3
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
---
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