aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/SliderBase.js9
-rwxr-xr-xjs/components/combobox.reel/combobox.js6
-rw-r--r--js/components/controllers/tree-controller.js11
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js5
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html2
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js7
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.js3
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html5
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js106
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html54
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js82
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html6
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js49
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js15
-rwxr-xr-xjs/components/menu/menu.reel/menu.html14
-rwxr-xr-xjs/components/radio.reel/radio.js21
-rwxr-xr-xjs/components/slider.reel/slider.js15
-rw-r--r--js/components/toolbar.reel/toolbar-button.js4
-rw-r--r--js/components/toolbar.reel/toolbar.js5
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js40
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js20
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js65
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js5
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.js11
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js11
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html4
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js15
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html1
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js20
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.js86
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html7
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js71
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js26
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html18
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js44
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.js12
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html2
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js35
-rw-r--r--js/components/treeview/treeview.reel/treeview.html2
-rw-r--r--js/components/treeview/treeview.reel/treeview.js43
42 files changed, 791 insertions, 170 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js
index 8df868a2..a6c3ff6d 100755
--- a/js/components/SliderBase.js
+++ b/js/components/SliderBase.js
@@ -83,7 +83,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
83 } 83 }
84 this.needsDraw = true; 84 this.needsDraw = true;
85 } 85 }
86 } 86 },
87 serializable: true
87 }, 88 },
88 89
89 // Internal flags to determine what the change/changing events will contain 90 // Internal flags to determine what the change/changing events will contain
@@ -153,7 +154,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
153 } 154 }
154 this.needsDraw = true; 155 this.needsDraw = true;
155 } 156 }
156 } 157 },
158 serializable: true
157 }, 159 },
158 160
159 _maxValue: { 161 _maxValue: {
@@ -175,7 +177,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
175 } 177 }
176 this.needsDraw = true; 178 this.needsDraw = true;
177 } 179 }
178 } 180 },
181 serializable: true
179 }, 182 },
180 183
181 _valueCoef: { 184 _valueCoef: {
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index bc433f52..29f49b7b 100755
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -20,7 +20,8 @@ exports.Combobox = Montage.create(Component, {
20 }, 20 },
21 21
22 labelField: { 22 labelField: {
23 value: null 23 value: null,
24 serializable: true
24 }, 25 },
25 26
26 labelFunction: { 27 labelFunction: {
@@ -28,7 +29,8 @@ exports.Combobox = Montage.create(Component, {
28 }, 29 },
29 30
30 dataField: { 31 dataField: {
31 value: null 32 value: null,
33 serializable: true
32 }, 34 },
33 35
34 dataFunction: { 36 dataFunction: {
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index cb95ca1d..bc3d0860 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -30,7 +30,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
30 }, 30 },
31 set: function(value) { 31 set: function(value) {
32 this._delegate = value; 32 this._delegate = value;
33 } 33 },
34 serializable: true
34 }, 35 },
35 36
36 rootKey : { 37 rootKey : {
@@ -38,7 +39,13 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
38 }, 39 },
39 40
40 branchKey : { 41 branchKey : {
41 value: null 42 value: null,
43 serializable: true
44 },
45
46 labelKey: {
47 value: null,
48 serializable: true
42 }, 49 },
43 50
44 _root : { 51 _root : {
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 0dabc781..68f3be2b 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -40,7 +40,7 @@
40 "buttonsListController": { 40 "buttonsListController": {
41 "prototype": "montage/ui/controller/array-controller", 41 "prototype": "montage/ui/controller/array-controller",
42 "bindings": { 42 "bindings": {
43 "content": {"<<->": "@owner.containerElements"} 43 "content": {"<->": "@owner.containerElements"}
44 } 44 }
45 }, 45 },
46 46
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index ac131f2c..d525c813 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -9,6 +9,11 @@ var Montage = require("montage/core/core").Montage,
9 9
10exports.Breadcrumb = Montage.create(Component, { 10exports.Breadcrumb = Montage.create(Component, {
11 11
12 breadcrumbBt: {
13 value: null,
14 serializable: true
15 },
16
12 _currentDocument: { 17 _currentDocument: {
13 enumerable: false, 18 enumerable: false,
14 value: null 19 value: null
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index a35b5590..889160ad 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -45,8 +45,6 @@
45 "prototype": "js/components/layout/document-bar.reel", 45 "prototype": "js/components/layout/document-bar.reel",
46 "properties": { 46 "properties": {
47 "element": {"#": "documentBar"}, 47 "element": {"#": "documentBar"},
48 "designView": {"#": "design"},
49 "codeView": {"#": "code"},
50 "zoomControl": {"@": "hottext1"} 48 "zoomControl": {"@": "hottext1"}
51 } 49 }
52 } 50 }
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 1cb0bd90..74ba11c2 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -61,7 +61,8 @@ exports.DocumentBar = Montage.create(Component, {
61 }, 61 },
62 62
63 zoomControl: { 63 zoomControl: {
64 value: null 64