aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js33
-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
-rwxr-xr-xjs/mediators/keyboard-mediator.js5
-rwxr-xr-xjs/ninja.reel/ninja.html4
-rwxr-xr-xjs/ninja.reel/ninja.js160
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js3
-rwxr-xr-xjs/panels/Panel.reel/Panel.html1
-rwxr-xr-xjs/panels/Panel.reel/Panel.js8
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js48
-rwxr-xr-xjs/panels/Resizer.js13
-rwxr-xr-xjs/panels/Splitter.js9
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js122
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html3
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.js10
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html2
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html2
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js10
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.js5
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html6
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js13
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.html1
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js19
-rw-r--r--js/panels/css-panel/styles-view-delegate.js6
-rw-r--r--js/panels/presets/content.reel/content.js15
-rwxr-xr-xjs/panels/properties.reel/properties.html9
-rwxr-xr-xjs/panels/properties.reel/properties.js19
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.js9
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html9
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js41
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js55
-rw-r--r--js/panels/resize-composer.js6
-rwxr-xr-xjs/stage/layout.js11
-rwxr-xr-xjs/stage/stage-deps.js5
-rwxr-xr-xjs/stage/stage.reel/stage.js79
76 files changed, 1458 insertions, 246 deletions
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index dabce6e0..13c9a705 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -52,6 +52,11 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
52 } 52 }
53 }, 53 },
54 54
55 autoCompleteLabel: {
56 value: null,
57 serializable: true
58 },
59
55 _autocomplete: { 60 _autocomplete: {
56 value: false 61 value: false
57 }, 62 },
@@ -73,7 +78,33 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
73 }, 78 },
74 79
75 codeCompleteCheck: { 80 codeCompleteCheck: {
76 value: null 81 value: null,
82 serializable: true
83 },
84
85 zoomHottext: {
86 value: null,
87 serializable: true
88 },
89
90 comment: {
91 value: null,
92 serializable: true
93 },
94
95 uncomment: {
96 value: null,
97 serializable: true
98 },
99
100 themeSelect: {
101 value: null,
102 serializable: true
103 },
104
105 shortKeys: {
106 value: null,
107 serializable: true
77 }, 108 },
78 109
79 prepareForDraw: { 110 prepareForDraw: {
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