aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/components/combobox.reel/combobox.js91
-rw-r--r--js/components/controllers/tree-controller.js185
-rw-r--r--js/components/tools-properties/fill-properties.reel/fill-properties.html11
-rw-r--r--js/components/tools-properties/fill-properties.reel/fill-properties.js6
-rw-r--r--js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html12
-rw-r--r--js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js6
-rw-r--r--js/components/tools-properties/line-properties.reel/line-properties.js14
-rw-r--r--js/components/tools-properties/oval-properties.reel/oval-properties.js14
-rw-r--r--js/components/tools-properties/rect-properties.reel/rect-properties.js14
-rw-r--r--js/components/tools-properties/shape-properties.reel/shape-properties.css6
-rw-r--r--js/components/tools-properties/shape-properties.reel/shape-properties.html35
-rw-r--r--js/components/tools-properties/shape-properties.reel/shape-properties.js36
-rw-r--r--js/components/tools-properties/tag-properties.reel/tag-properties.html6
-rw-r--r--js/components/treeview/branch.reel/branch.css22
-rw-r--r--js/components/treeview/branch.reel/branch.html147
-rw-r--r--js/components/treeview/branch.reel/branch.js48
-rw-r--r--js/components/treeview/leaf.reel/leaf.css10
-rw-r--r--js/components/treeview/leaf.reel/leaf.html43
-rw-r--r--js/components/treeview/leaf.reel/leaf.js44
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.css40
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html150
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js131
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.css28
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.html43
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.js41
-rw-r--r--js/components/treeview/tree-node.js103
-rw-r--r--js/components/treeview/treeview.reel/treeview.css5
-rw-r--r--js/components/treeview/treeview.reel/treeview.html55
-rw-r--r--js/components/treeview/treeview.reel/treeview.js129
-rw-r--r--js/controllers/elements/element-controller.js13
-rw-r--r--js/controllers/elements/shapes-controller.js102
-rw-r--r--js/controllers/styles-controller.js232
-rw-r--r--js/controllers/tree-controller.js185
-rw-r--r--js/data/pi/pi-data.js62
-rw-r--r--js/data/tools-data.js6
-rw-r--r--js/helper-classes/3D/draw-utils.js47
-rw-r--r--js/helper-classes/3D/snap-manager.js15
-rw-r--r--js/helper-classes/RDGE/GLCircle.js79
-rw-r--r--js/helper-classes/RDGE/GLGeomObj.js51
-rw-r--r--js/helper-classes/RDGE/GLLine.js27
-rw-r--r--js/helper-classes/RDGE/GLRectangle.js65
-rw-r--r--js/helper-classes/RDGE/GLWorld.js2
-rw-r--r--js/helper-classes/RDGE/MaterialsLibrary.js2
-rw-r--r--js/mediators/drag-drop-mediator.js11
-rw-r--r--js/mediators/element-mediator.js27
-rw-r--r--js/mediators/keyboard-mediator.js6
-rw-r--r--js/models/shape-model.js3
-rw-r--r--js/panels/Color/colortoolbar.reel/colortoolbar.js8
-rw-r--r--js/panels/properties/content.reel/content.js32
-rw-r--r--js/panels/properties/sections/custom.reel/custom.js14
-rwxr-xr-xjs/preloader/Preloader.js1
-rw-r--r--js/stage/layout.js19
-rw-r--r--js/tools/FillTool.js20
-rw-r--r--js/tools/LineTool.js9
-rw-r--r--js/tools/OvalTool.js15
-rw-r--r--js/tools/RectTool.js15
-rw-r--r--js/tools/ShapeTool.js1
-rw-r--r--js/tools/TagTool.js12
-rwxr-xr-xnode_modules/montage/core/event/binding.js4
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js4
-rwxr-xr-xnode_modules/montage/core/promise.js11
-rwxr-xr-xnode_modules/montage/ui/component.js48
-rw-r--r--node_modules/montage/ui/composer/composer.js14
-rw-r--r--node_modules/montage/ui/composer/swipe-composer.js24
-rwxr-xr-xnode_modules/montage/ui/slot.reel/slot.js5
65 files changed, 2303 insertions, 363 deletions
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index a68a7d6b..bc433f52 100644
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -15,7 +15,7 @@ exports.Combobox = Montage.create(Component, {
15 }, 15 },
16 16
17 _wasSetByCode: { 17 _wasSetByCode: {
18 enumerable: false, 18 enumerable: true,
19 value: true 19 value: true
20 }, 20 },
21 21
@@ -27,6 +27,14 @@ exports.Combobox = Montage.create(Component, {
27 value: null 27 value: null
28 }, 28 },
29 29
30 dataField: {
31 value: null
32 },
33
34 dataFunction: {
35 value: null
36 },
37
30 _items: { 38 _items: {
31 value: [] 39 value: []
32 }, 40 },
@@ -71,7 +79,47 @@ exports.Combobox = Montage.create(Component, {
71 e.value = this._value; 79 e.value = this._value;
72 this.dispatchEvent(e); 80 this.dispatchEvent(e);
73 81
74 this._wasSetByCode = false; 82 this._wasSetByCode = true;
83 }
84 }
85 },
86
87 _enabled: {
88 enumerable: false,
89 value: true
90 },
91
92 enabled: {
93 enumerable: true,
94 serializable: true,
95 get: function() {
96 return this._enabled;
97 },
98 set: function(value) {
99 if(value !== this._enabled)
100 {
101 this._enabled = value;
102 this.needsDraw = true;
103 }
104 }
105 },
106
107 _visible: {
108 enumerable: false,
109 value: true
110 },
111
112 visible: {
113 enumerable: true,
114 serializable: true,
115 get: function() {
116 return this._visible;
117 },
118 set: function(value) {
119 if(value !== this._visible)
120 {
121 this._visible = value;
122 this.needsDraw = true;
75 } 123 }
76 } 124 }
77 }, 125 },
@@ -102,7 +150,19 @@ exports.Combobox = Montage.create(Component, {
102 { 150 {
103 var current = items[i]; 151 var current = items[i];
104 optionItem = document.createElement("option"); 152 optionItem = document.createElement("option");
105 optionItem.value = current; 153 if(this.dataFunction)
154 {
155 optionItem.value = this.dataFunction(current);
156 }
157 else if(this.dataField)
158 {
159 optionItem.value = current[this.dataField];
160 }
161 else
162 {
163 optionItem.value = current;
164 }
165
106 if(this.labelFunction) 166 if(this.labelFunction)
107 { 167 {
108 optionItem.innerText = this.labelFunction(current); 168 optionItem.innerText = this.labelFunction(current);
@@ -117,6 +177,15 @@ exports.Combobox = Montage.create(Component, {
117 } 177 }
118 this.element.appendChild(optionItem); 178 this.element.appendChild(optionItem);
119 } 179 }
180 this.element.disabled = !this._enabled;
181 if(this._visible)
182 {
183 this.element.style.visibility = "visible";
184