diff options
author | Jon Reid | 2012-06-26 14:58:10 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/components | |
parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components')
10 files changed, 212 insertions, 152 deletions
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js index 103e418f..88b93b2c 100644 --- a/js/components/editable.reel/editable.js +++ b/js/components/editable.reel/editable.js | |||
@@ -93,12 +93,43 @@ exports.Editable = Montage.create(Component, { | |||
93 | } | 93 | } |
94 | } | 94 | } |
95 | }, | 95 | }, |
96 | |||
97 | _value : { value: null }, | ||
96 | value : { | 98 | value : { |
97 | get: function() { | 99 | get : function() { return this._value; }, |
98 | return this._element.textContent; | 100 | set : function(value) { |
99 | }, | 101 | if(value === this._value) { return; } |
100 | set: function(str) { | 102 | |
101 | this._element.textContent = str; | 103 | var node = this._getFirstTextNode(); |
104 | node.textContent = value; | ||
105 | |||
106 | this._value = value; | ||
107 | } | ||
108 | }, | ||
109 | _getFirstTextNode : { | ||
110 | value : function(el) { | ||
111 | ///// optional el argument specified container element | ||
112 | var e = el || this._element, | ||
113 | nodes = e.childNodes, node; | ||
114 | |||
115 | if(nodes.length) { | ||
116 | for(var i=0; i<nodes.length; i++) { | ||
117 | if(nodes[i].nodeType === 3) { | ||
118 | ///// found the first text node | ||
119 | node = nodes[i]; | ||
120 | break; | ||
121 | } | ||
122 | } | ||
123 | } | ||
124 | |||
125 | ///// Text node not found | ||
126 | if(!node) { | ||
127 | node = document.createTextNode(''); | ||
128 | e.appendChild(node); | ||
129 | } | ||
130 | |||
131 | |||
132 | return node; | ||
102 | } | 133 | } |
103 | }, | 134 | }, |
104 | 135 | ||
@@ -207,6 +238,8 @@ exports.Editable = Montage.create(Component, { | |||
207 | ///// Text input has changed values | 238 | ///// Text input has changed values |
208 | handleInput : { | 239 | handleInput : { |
209 | value : function(e) { | 240 | value : function(e) { |
241 | this.value = this._getFirstTextNode().textContent; | ||
242 | |||
210 | if(!this.isDirty) { | 243 | if(!this.isDirty) { |
211 | this.isDirty = true; | 244 | this.isDirty = true; |
212 | } | 245 | } |
@@ -230,6 +263,8 @@ exports.Editable = Montage.create(Component, { | |||
230 | value: function(e) { | 263 | value: function(e) { |
231 | e.preventDefault(); | 264 | e.preventDefault(); |
232 | document.execCommand('insertHTML', null, e._event.clipboardData.getData("Text")); | 265 | document.execCommand('insertHTML', null, e._event.clipboardData.getData("Text")); |
266 | this.value = this._element.textContent; | ||
267 | |||
233 | this._sendEvent('paste', e); | 268 | this._sendEvent('paste', e); |
234 | } | 269 | } |
235 | }, | 270 | }, |
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js index 08e87bf0..fb55c937 100644 --- a/js/components/hintable.reel/hintable.js +++ b/js/components/hintable.reel/hintable.js | |||
@@ -140,19 +140,6 @@ exports.Hintable = Montage.create(Editable, { | |||
140 | } | 140 | } |
141 | } | 141 | } |
142 | }, | 142 | }, |
143 | value : { | ||
144 | get: function() { | ||
145 | return this._getFirstTextNode().textContent; | ||
146 | }, | ||
147 | set: function(str) { | ||
148 | var node = this._getFirstTextNode(); | ||
149 | if (node.textContent !== str) { | ||
150 | node.textContent = str; | ||
151 | } | ||
152 | |||
153 | //node.innerText = str; | ||
154 | } | ||
155 | }, | ||
156 | 143 | ||
157 | handleKeydown : { | 144 | handleKeydown : { |
158 | value : function handleKeydown(e) { | 145 | value : function handleKeydown(e) { |
@@ -189,17 +176,18 @@ exports.Hintable = Montage.create(Editable, { | |||
189 | handleInput : { | 176 | handleInput : { |
190 | value : function handleInput(e) { | 177 | value : function handleInput(e) { |
191 | this._super(arguments); | 178 | this._super(arguments); |
192 | 179 | ||
193 | var val = this.value, | 180 | var val = this.value, |
194 | matches, hint; | 181 | matches, hint; |
195 | //console.log('val = "' + val + '"'); | 182 | //console.log('val = "' + val + '"'); |
196 | //// Handle auto-suggest if configured | 183 | //// Handle auto-suggest if configured |
197 | if(this.hints instanceof Array) { | 184 | if(this.hints && this.hints.length) { |
198 | 185 | ||
199 | if(val.length > 0) { // content is not empty | 186 | if(val.length > 0) { // content is not empty |
200 | 187 | ||
201 | this._matchIndex = 0; | 188 | this._matchIndex = 0; |
202 | this.matches = this.hints.filter(function(h) { | 189 | this.matches = this.hints.filter(function(h) { |
190 | if(!h) { return false; } | ||
203 | return h.indexOf(val) === 0; | 191 | return h.indexOf(val) === 0; |
204 | }).sort(); | 192 | }).sort(); |
205 | 193 | ||
@@ -275,32 +263,6 @@ exports.Hintable = Montage.create(Editable, { | |||
275 | return Array.prototype.slice.call(arrayLikeObj); | 263 | return Array.prototype.slice.call(arrayLikeObj); |
276 | } | 264 | } |
277 | }, | 265 | }, |
278 | _getFirstTextNode : { | ||
279 | value : function(el) { | ||
280 | ///// optional el argument specified container element | ||
281 | var e = el || this._element, | ||
282 | nodes = e.childNodes, node; | ||
283 | |||
284 | if(nodes.length) { | ||
285 | for(var i=0; i<nodes.length; i++) { | ||
286 | if(nodes[i].nodeType === 3) { | ||
287 | ///// found the first text node | ||
288 | node = nodes[i]; | ||
289 | break; | ||
290 | } | ||
291 | } | ||
292 | } | ||
293 | |||
294 | ///// Text node not found | ||
295 | if(!node) { | ||
296 | node = document.createTextNode(''); | ||
297 | e.appendChild(node); | ||
298 | } | ||
299 | |||
300 | |||
301 | return node; | ||
302 | } | ||
303 | }, | ||
304 | _super : { | 266 | _super : { |
305 | value : function(args) { | 267 | value : function(args) { |
306 | this.inheritsFrom[arguments.callee.caller.name].apply(this, args); | 268 | this.inheritsFrom[arguments.callee.caller.name].apply(this, args); |
@@ -309,7 +271,8 @@ exports.Hintable = Montage.create(Editable, { | |||
309 | 271 | ||
310 | /* --------- CONFIG ---------- */ | 272 | /* --------- CONFIG ---------- */ |
311 | hints : { | 273 | hints : { |
312 | value : ['Testing a hint.', 'Testing another hint.', 'Testing the last hint.'] | 274 | value : ['Testing a hint.', 'Testing another hint.', 'Testing the last hint.'], |
275 | distinct: true | ||
313 | }, | 276 | }, |
314 | hintClass : { | 277 | hintClass : { |
315 | value : "hintable-hint" | 278 | value : "hintable-hint" |
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index 3a9661f5..5b175f49 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -95,6 +95,9 @@ | |||
95 | "ZoomTool1": { | 95 | "ZoomTool1": { |
96 | "prototype": "js/tools/ZoomTool" | 96 | "prototype": "js/tools/ZoomTool" |
97 | }, | 97 | }, |
98 | "BindingTool1": { | ||
99 | "prototype": "js/tools/BindingTool" | ||
100 | }, | ||
98 | 101 | ||
99 | "disable": { | 102 | "disable": { |
100 | "prototype": "montage/ui/condition.reel", | 103 | "prototype": "montage/ui/condition.reel", |
@@ -126,7 +129,11 @@ | |||
126 | "EraserTool": {"@": "EraserTool1"}, | 129 | "EraserTool": {"@": "EraserTool1"}, |
127 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, | 130 | "RotateStageTool3D": {"@": "RotateStageTool3D1"}, |
128 | "PanTool": {"@": "PanTool1"}, | 131 | "PanTool": {"@": "PanTool1"}, |
129 | "ZoomTool": {"@": "ZoomTool1"} | 132 | "ZoomTool": {"@": "ZoomTool1"}, |
133 | "bindingTool": {"@": "BindingTool1"}, | ||
134 | "components": [ | ||
135 | {"@": "repetition1"} | ||
136 | ] | ||