aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /js/components
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
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/hottext.reel/hottext.js13
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.js9
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html2
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js6
-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/document-entry.reel/document-entry.js5
-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.js25
-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.js33
-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.js33
-rw-r--r--js/components/treeview/ninja-leaf.reel/ninja-leaf.js7
-rw-r--r--js/components/treeview/treeview.reel/treeview.html2
-rw-r--r--js/components/treeview/treeview.reel/treeview.js39
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js5
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js10
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js12
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html22
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.js4
51 files changed, 872 insertions, 194 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/hottext.reel/hottext.js b/js/components/hottext.reel/hottext.js
index 0480597a..93e6e745 100755
--- a/js/components/hottext.reel/hottext.js
+++ b/js/components/hottext.reel/hottext.js
@@ -121,13 +121,19 @@ var HotText = exports.HotText = Montage.create(SliderBase, {
121 value: 2000 121 value: 2000
122 }, 122 },
123 123
124 // Flag used to dispatch a single change event if either or both of value and units are changed
125 _unitsModified: {
126 enumerable: false,
127 value: false
128 },
129
124 value: { 130 value: {
125 serializable: true, 131 serializable: true,
126 enumerable: true, 132 enumerable: true,
127 get: function() { 133 get: function() {
128 return this._value; 134 return this._value;
129 }, 135 },
130 set: function(value, fromInput) { 136 set: function(value) {
131 if (isNaN(value)) { 137 if (isNaN(value)) {
132 this._valueSyncedWithInputField = false; 138 this._valueSyncedWithInputField = false;
133 this.needsDraw = true; 139 this.needsDraw = true;
@@ -149,6 +155,9 @@ var HotText = exports.HotText = Montage.create(SliderBase, {
149 this._valueSyncedWithInputField = false; 155 this._valueSyncedWithInputField = false;
150 this.needsDraw = true; 156 this.needsDraw = true;
151 this._dispatchActionEvent(); 157 this._dispatchActionEvent();
158 } else if(this._unitsModified) {
159 // Need to dispatch change event if units changed
160 this._dispatchActionEvent();
152 } 161 }
153 } 162 }
154 }, 163 },
@@ -164,7 +173,7 @@ var HotText = exports.HotText = Montage.create(SliderBase, {
164 enumerable: false, 173 enumerable: false,
165