diff options
author | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
commit | 9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch) | |
tree | e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js | |
parent | aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff) | |
parent | 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff) | |
download | ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js')
58 files changed, 2221 insertions, 335 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 | } | ||
185 | else | ||
186 | { | ||
187 | this.element.style.visibility = "hidden"; | ||
188 | } | ||
120 | } | 189 | } |
121 | } | 190 | } |
122 | }, | 191 | }, |
@@ -133,6 +202,22 @@ exports.Combobox = Montage.create(Component, { | |||
133 | 202 | ||
134 | prepareForDraw: { | 203 | prepareForDraw: { |
135 | value: function() { | 204 | value: function() { |