aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html37
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js24
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.js4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.js11
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html12
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html46
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js79
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js13
-rwxr-xr-xjs/controllers/document-controller.js95
-rwxr-xr-xjs/controllers/elements/body-controller.js2
-rwxr-xr-xjs/controllers/selection-controller.js4
-rwxr-xr-xjs/data/tools-data.js13
-rwxr-xr-xjs/document/document-html.js31
-rwxr-xr-xjs/document/html-document.js78
-rwxr-xr-xjs/document/models/base.js20
-rwxr-xr-xjs/document/models/html.js17
-rw-r--r--js/document/templates/app/main.js (renamed from js/document/templates/html/main.js)4
-rwxr-xr-xjs/document/templates/app/package.json (renamed from js/document/templates/html/package.json)0
-rwxr-xr-xjs/document/templates/banner/index.html2
-rw-r--r--js/document/templates/banner/main.js49
-rwxr-xr-xjs/document/templates/banner/package.json9
-rwxr-xr-xjs/document/templates/html/index.html2
-rwxr-xr-xjs/document/templates/montage-html/package.json9
-rwxr-xr-xjs/document/views/design.js34
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js4
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js20
-rwxr-xr-xjs/helper-classes/3D/view-utils.js62
-rw-r--r--js/mediators/io-mediator.js79
-rwxr-xr-xjs/ninja.reel/ninja.js34
-rwxr-xr-xjs/panels/properties.reel/properties.js41
-rwxr-xr-xjs/stage/stage-deps.js73
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js22
-rwxr-xr-xjs/stage/stage.reel/stage.html3
-rwxr-xr-xjs/stage/stage.reel/stage.js77
-rwxr-xr-xjs/tools/ShapeTool.js2
-rwxr-xr-xjs/tools/drawing-tool-base.js39
37 files changed, 437 insertions, 618 deletions
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 @@
32 } 32 }
33 ], 33 ],
34 "bindings": { 34 "bindings": {
35 "label": { 35 "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
36 "boundObject": {"@": "repetition1"}, 36 "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
37 "boundObjectPropertyPath": "objectAtCurrentIteration.label", 37 }
38 "oneway": true 38 },
39 }, 39
40 "value": { 40 "buttonsListController": {
41 "boundObject": {"@": "repetition1"}, 41 "prototype": "montage/ui/controller/array-controller",
42 "boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid", 42 "bindings": {
43 "oneway": true 43 "content": {"<<->": "@owner.containerElements"}
44 }
45 } 44 }
46 }, 45 },
47 46
48 "repetition1": { 47 "buttonsList": {
49 "prototype": "montage/ui/repetition.reel", 48 "prototype": "montage/ui/repetition.reel",
50 "properties": { 49 "properties": {
51 "element": {"#": "breadcrumb_container"} 50 "element": {"#": "breadcrumb_container"},
52 }, 51 "contentController": {"@": "buttonsListController"}
53 "bindings": {
54 "objects": {
55 "boundObject": {"@": "owner"},
56 "boundObjectPropertyPath": "containerElements",
57 "oneway": true
58 }
59 } 52 }
60 }, 53 },
61 54
@@ -65,11 +58,7 @@
65 "element": {"#": "disabledCondition"} 58 "element": {"#": "disabledCondition"}
66 }, 59 },
67 "bindings": { 60 "bindings": {
68 "condition": { 61 "condition": {"<-": "@owner.disabled"}
69 "boundObject": {"@": "owner"},
70 "boundObjectPropertyPath": "disabled",
71 "oneway": true
72 }
73 } 62 }
74 } 63 }
75 } 64 }
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, {
60 value: function() { 60 value: function() {
61 var parentNode; 61 var parentNode;
62 62
63 this.containerElements.length = 0; 63// delete this.containerElements;
64 this.containerElements = [];
64 65
65 parentNode = this.container; 66 parentNode = this.container;
66 67
67 // This is for the old template support. 68 while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
68 // TODO: Remove marker for old template: NINJA-STAGE-REWORK
69 if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
70 while(parentNode.id !== "UserContent") {
71 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
72 parentNode = parentNode.parentNode;
73 }
74
75 // This is always the top container which is now hardcoded to body
76 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
77 } else {
78 while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
79 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
80 parentNode = parentNode.parentNode;
81 }
82
83 // This is always the top container which is now hardcoded to body
84 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;
85 } 71 }
86 72
73 // This is always the top container which is now hardcoded to body
74 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
87 } 75 }
88 }, 76 },
89 77
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, {
121 if(event._event.target.nodeName === "IMG") { 121 if(event._event.target.nodeName === "IMG") {
122 this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); 122 this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
123 } else { 123 } else {
124 if(!this._document.isActive) { 124 if(!this.active) {
125 this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); 125 this.application.ninja.documentController.switchDocuments(this.application.ninja.currentDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
126 } 126 }
127 } 127 }
128 } 128 }
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 @@
16 "prototype": "js/components/layout/tool-button.reel", 16 "prototype": "js/components/layout/tool-button.reel",
17 "properties": { 17 "properties": {
18 "element": {"#": "toolBarButton"} 18 "element": {"#": "toolBarButton"}
19 },
20 "bindings": {
21 "selected": {"<<->": "@owner.data.selected"},
22 "subselected": {"<-": "@owner.data.subtools.selected"}
19 } 23 }
20 } 24 }
21 } 25 }
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, {
48 this.element.addEventListener("mousedown", this, false); 48 this.element.addEventListener("mousedown", this, false);
49 this.element.addEventListener("dblclick", this, false); 49 this.element.addEventListener("dblclick", this, false);
50 50
51 Object.defineBinding(this, "selected", {
52 boundObject: this.data,