Description:
more updated rails
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@360 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
jittat
-
r163:74e3afe899a3 - - 5 files changed: 779 inserted, 674 deleted
| @@ -44,6 +44,7 | |||
|
|
44 | 44 | def load_initializer |
|
|
45 | 45 | require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" |
|
|
46 | 46 | Rails::Initializer.run(:install_gem_spec_stubs) |
|
|
47 | + Rails::GemDependency.add_frozen_gem_path | |
|
|
47 | 48 | end |
|
|
48 | 49 | end |
|
|
49 | 50 | |
| @@ -67,7 +68,7 | |||
|
|
67 | 68 | |
|
|
68 | 69 | class << self |
|
|
69 | 70 | def rubygems_version |
|
|
70 |
- Gem::RubyGemsVersion |
|
|
|
71 | + Gem::RubyGemsVersion rescue nil | |
|
|
71 | 72 | end |
|
|
72 | 73 | |
|
|
73 | 74 | def gem_version |
| @@ -82,7 +83,7 | |||
|
|
82 | 83 | |
|
|
83 | 84 | def load_rubygems |
|
|
84 | 85 | require 'rubygems' |
|
|
85 |
- min_version = '1. |
|
|
|
86 | + min_version = '1.3.1' | |
|
|
86 | 87 | unless rubygems_version >= min_version |
|
|
87 | 88 | $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.) |
|
|
88 | 89 | exit 1 |
| @@ -1,22 +1,22 | |||
|
|
1 | 1 | // Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) |
|
|
2 |
- // (c) 2005-200 |
|
|
|
3 |
- // (c) 2005-200 |
|
|
|
2 | + // (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan) | |
|
|
3 | + // (c) 2005-2008 Jon Tirsen (http://www.tirsen.com) | |
|
|
4 | 4 | // Contributors: |
|
|
5 | 5 | // Richard Livsey |
|
|
6 | 6 | // Rahul Bhargava |
|
|
7 | 7 | // Rob Wills |
|
|
8 |
- // |
|
|
|
8 | + // | |
|
|
9 | 9 | // script.aculo.us is freely distributable under the terms of an MIT-style license. |
|
|
10 | 10 | // For details, see the script.aculo.us web site: http://script.aculo.us/ |
|
|
11 | 11 | |
|
|
12 |
- // Autocompleter.Base handles all the autocompletion functionality |
|
|
|
12 | + // Autocompleter.Base handles all the autocompletion functionality | |
|
|
13 | 13 | // that's independent of the data source for autocompletion. This |
|
|
14 | 14 | // includes drawing the autocompletion menu, observing keyboard |
|
|
15 | 15 | // and mouse events, and similar. |
|
|
16 | 16 | // |
|
|
17 |
- // Specific autocompleters need to provide, at the very least, |
|
|
|
17 | + // Specific autocompleters need to provide, at the very least, | |
|
|
18 | 18 | // a getUpdatedChoices function that will be invoked every time |
|
|
19 |
- // the text inside the monitored textbox changes. This method |
|
|
|
19 | + // the text inside the monitored textbox changes. This method | |
|
|
20 | 20 | // should get the text for which to provide autocompletion by |
|
|
21 | 21 | // invoking this.getToken(), NOT by directly accessing |
|
|
22 | 22 | // this.element.value. This is to allow incremental tokenized |
| @@ -30,23 +30,23 | |||
|
|
30 | 30 | // will incrementally autocomplete with a comma as the token. |
|
|
31 | 31 | // Additionally, ',' in the above example can be replaced with |
|
|
32 | 32 | // a token array, e.g. { tokens: [',', '\n'] } which |
|
|
33 |
- // enables autocompletion on multiple tokens. This is most |
|
|
|
34 |
- // useful when one of the tokens is \n (a newline), as it |
|
|
|
33 | + // enables autocompletion on multiple tokens. This is most | |
|
|
34 | + // useful when one of the tokens is \n (a newline), as it | |
|
|
35 | 35 | // allows smart autocompletion after linebreaks. |
|
|
36 | 36 | |
|
|
37 | 37 | if(typeof Effect == 'undefined') |
|
|
38 | 38 | throw("controls.js requires including script.aculo.us' effects.js library"); |
|
|
39 | 39 | |
|
|
40 | - var Autocompleter = { } | |
|
|
40 | + var Autocompleter = { }; | |
|
|
41 | 41 | Autocompleter.Base = Class.create({ |
|
|
42 | 42 | baseInitialize: function(element, update, options) { |
|
|
43 | - element = $(element) | |
|
|
44 |
- this.element = element; |
|
|
|
45 |
- this.update = $(update); |
|
|
|
46 |
- this.hasFocus = false; |
|
|
|
47 |
- this.changed = false; |
|
|
|
48 |
- this.active = false; |
|
|
|
49 |
- this.index = 0; |
|
|
|
43 | + element = $(element); | |
|
|
44 | + this.element = element; | |
|
|
45 | + this.update = $(update); | |
|
|
46 | + this.hasFocus = false; | |
|
|
47 | + this.changed = false; | |
|
|
48 | + this.active = false; | |
|
|
49 | + this.index = 0; | |
|
|
50 | 50 | this.entryCount = 0; |
|
|
51 | 51 | this.oldElementValue = this.element.value; |
|
|
52 | 52 | |
| @@ -59,28 +59,28 | |||
|
|
59 | 59 | this.options.tokens = this.options.tokens || []; |
|
|
60 | 60 | this.options.frequency = this.options.frequency || 0.4; |
|
|
61 | 61 | this.options.minChars = this.options.minChars || 1; |
|
|
62 |
- this.options.onShow = this.options.onShow || |
|
|
|
63 |
- function(element, update){ |
|
|
|
62 | + this.options.onShow = this.options.onShow || | |
|
|
63 | + function(element, update){ | |
|
|
64 | 64 | if(!update.style.position || update.style.position=='absolute') { |
|
|
65 | 65 | update.style.position = 'absolute'; |
|
|
66 | 66 | Position.clone(element, update, { |
|
|
67 |
- setHeight: false, |
|
|
|
67 | + setHeight: false, | |
|
|
68 | 68 | offsetTop: element.offsetHeight |
|
|
69 | 69 | }); |
|
|
70 | 70 | } |
|
|
71 | 71 | Effect.Appear(update,{duration:0.15}); |
|
|
72 | 72 | }; |
|
|
73 |
- this.options.onHide = this.options.onHide || |
|
|
|
73 | + this.options.onHide = this.options.onHide || | |
|
|
74 | 74 | function(element, update){ new Effect.Fade(update,{duration:0.15}) }; |
|
|
75 | 75 | |
|
|
76 |
- if(typeof(this.options.tokens) == 'string') |
|
|
|
76 | + if(typeof(this.options.tokens) == 'string') | |
|
|
77 | 77 | this.options.tokens = new Array(this.options.tokens); |
|
|
78 | 78 | // Force carriage returns as token delimiters anyway |
|
|
79 | 79 | if (!this.options.tokens.include('\n')) |
|
|
80 | 80 | this.options.tokens.push('\n'); |
|
|
81 | 81 | |
|
|
82 | 82 | this.observer = null; |
|
|
83 | - | |
|
|
83 | + | |
|
|
84 | 84 | this.element.setAttribute('autocomplete','off'); |
|
|
85 | 85 | |
|
|
86 | 86 | Element.hide(this.update); |
| @@ -91,10 +91,10 | |||
|
|
91 | 91 | |
|
|
92 | 92 | show: function() { |
|
|
93 | 93 | if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update); |
|
|
94 |
- if(!this.iefix && |
|
|
|
94 | + if(!this.iefix && | |
|
|
95 | 95 | (Prototype.Browser.IE) && |
|
|
96 | 96 | (Element.getStyle(this.update, 'position')=='absolute')) { |
|
|
97 |
- new Insertion.After(this.update, |
|
|
|
97 | + new Insertion.After(this.update, | |
|
|
98 | 98 | '<iframe id="' + this.update.id + '_iefix" '+ |
|
|
99 | 99 | 'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' + |
|
|
100 | 100 | 'src="javascript:false;" frameborder="0" scrolling="no"></iframe>'); |
| @@ -102,7 +102,7 | |||
|
|
102 | 102 | } |
|
|
103 | 103 | if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50); |
|
|
104 | 104 | }, |
|
|
105 | - | |
|
|
105 | + | |
|
|
106 | 106 | fixIEOverlapping: function() { |
|
|
107 | 107 | Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)}); |
|
|
108 | 108 | this.iefix.style.zIndex = 1; |
| @@ -150,15 +150,15 | |||
|
|
150 | 150 | Event.stop(event); |
|
|
151 | 151 | return; |
|
|
152 | 152 | } |
|
|
153 |
- else |
|
|
|
154 |
- if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || |
|
|
|
153 | + else | |
|
|
154 | + if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || | |
|
|
155 | 155 | (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return; |
|
|
156 | 156 | |
|
|
157 | 157 | this.changed = true; |
|
|
158 | 158 | this.hasFocus = true; |
|
|
159 | 159 | |
|
|
160 | 160 | if(this.observer) clearTimeout(this.observer); |
|
|
161 |
- this.observer = |
|
|
|
161 | + this.observer = | |
|
|
162 | 162 | setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000); |
|
|
163 | 163 | }, |
|
|
164 | 164 | |
| @@ -170,35 +170,35 | |||
|
|
170 | 170 | |
|
|
171 | 171 | onHover: function(event) { |
|
|
172 | 172 | var element = Event.findElement(event, 'LI'); |
|
|
173 |
- if(this.index != element.autocompleteIndex) |
|
|
|
173 | + if(this.index != element.autocompleteIndex) | |
|
|
174 | 174 | { |
|
|
175 | 175 | this.index = element.autocompleteIndex; |
|
|
176 | 176 | this.render(); |
|
|
177 | 177 | } |
|
|
178 | 178 | Event.stop(event); |
|
|
179 | 179 | }, |
|
|
180 | - | |
|
|
180 | + | |
|
|
181 | 181 | onClick: function(event) { |
|
|
182 | 182 | var element = Event.findElement(event, 'LI'); |
|
|
183 | 183 | this.index = element.autocompleteIndex; |
|
|
184 | 184 | this.selectEntry(); |
|
|
185 | 185 | this.hide(); |
|
|
186 | 186 | }, |
|
|
187 | - | |
|
|
187 | + | |
|
|
188 | 188 | onBlur: function(event) { |
|
|
189 | 189 | // needed to make click events working |
|
|
190 | 190 | setTimeout(this.hide.bind(this), 250); |
|
|
191 | 191 | this.hasFocus = false; |
|
|
192 |
- this.active = false; |
|
|
|
193 |
- }, |
|
|
|
194 | - | |
|
|
192 | + this.active = false; | |
|
|
193 | + }, | |
|
|
194 | + | |
|
|
195 | 195 | render: function() { |
|
|
196 | 196 | if(this.entryCount > 0) { |
|
|
197 | 197 | for (var i = 0; i < this.entryCount; i++) |
|
|
198 |
- this.index==i ? |
|
|
|
199 |
- Element.addClassName(this.getEntry(i),"selected") : |
|
|
|
198 | + this.index==i ? | |
|
|
199 | + Element.addClassName(this.getEntry(i),"selected") : | |
|
|
200 | 200 | Element.removeClassName(this.getEntry(i),"selected"); |
|
|
201 |
- if(this.hasFocus) { |
|
|
|
201 | + if(this.hasFocus) { | |
|
|
202 | 202 | this.show(); |
|
|
203 | 203 | this.active = true; |
|
|
204 | 204 | } |
| @@ -207,27 +207,27 | |||
|
|
207 | 207 | this.hide(); |
|
|
208 | 208 | } |
|
|
209 | 209 | }, |
|
|
210 | - | |
|
|
210 | + | |
|
|
211 | 211 | markPrevious: function() { |
|
|
212 | - if(this.index > 0) this.index-- | |
|
|
212 | + if(this.index > 0) this.index--; | |
|
|
213 | 213 | else this.index = this.entryCount-1; |
|
|
214 | 214 | this.getEntry(this.index).scrollIntoView(true); |
|
|
215 | 215 | }, |
|
|
216 | - | |
|
|
216 | + | |
|
|
217 | 217 | markNext: function() { |
|
|
218 | - if(this.index < this.entryCount-1) this.index++ | |
|
|
218 | + if(this.index < this.entryCount-1) this.index++; | |
|
|
219 | 219 | else this.index = 0; |
|
|
220 | 220 | this.getEntry(this.index).scrollIntoView(false); |
|
|
221 | 221 | }, |
|
|
222 | - | |
|
|
222 | + | |
|
|
223 | 223 | getEntry: function(index) { |
|
|
224 | 224 | return this.update.firstChild.childNodes[index]; |
|
|
225 | 225 | }, |
|
|
226 | - | |
|
|
226 | + | |
|
|
227 | 227 | getCurrentEntry: function() { |
|
|
228 | 228 | return this.getEntry(this.index); |
|
|
229 | 229 | }, |
|
|
230 | - | |
|
|
230 | + | |
|
|
231 | 231 | selectEntry: function() { |
|
|
232 | 232 | this.active = false; |
|
|
233 | 233 | this.updateElement(this.getCurrentEntry()); |
| @@ -244,7 +244,7 | |||
|
|
244 | 244 | if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); |
|
|
245 | 245 | } else |
|
|
246 | 246 | value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); |
|
|
247 | - | |
|
|
247 | + | |
|
|
248 | 248 | var bounds = this.getTokenBounds(); |
|
|
249 | 249 | if (bounds[0] != -1) { |
|
|
250 | 250 | var newValue = this.element.value.substr(0, bounds[0]); |
| @@ -257,7 +257,7 | |||
|
|
257 | 257 | } |
|
|
258 | 258 | this.oldElementValue = this.element.value; |
|
|
259 | 259 | this.element.focus(); |
|
|
260 | - | |
|
|
260 | + | |
|
|
261 | 261 | if (this.options.afterUpdateElement) |
|
|
262 | 262 | this.options.afterUpdateElement(this.element, selectedElement); |
|
|
263 | 263 | }, |
| @@ -269,20 +269,20 | |||
|
|
269 | 269 | Element.cleanWhitespace(this.update.down()); |
|
|
270 | 270 | |
|
|
271 | 271 | if(this.update.firstChild && this.update.down().childNodes) { |
|
|
272 |
- this.entryCount = |
|
|
|
272 | + this.entryCount = | |
|
|
273 | 273 | this.update.down().childNodes.length; |
|
|
274 | 274 | for (var i = 0; i < this.entryCount; i++) { |
|
|
275 | 275 | var entry = this.getEntry(i); |
|
|
276 | 276 | entry.autocompleteIndex = i; |
|
|
277 | 277 | this.addObservers(entry); |
|
|
278 | 278 | } |
|
|
279 |
- } else { |
|
|
|
279 | + } else { | |
|
|
280 | 280 | this.entryCount = 0; |
|
|
281 | 281 | } |
|
|
282 | 282 | |
|
|
283 | 283 | this.stopIndicator(); |
|
|
284 | 284 | this.index = 0; |
|
|
285 | - | |
|
|
285 | + | |
|
|
286 | 286 | if(this.entryCount==1 && this.options.autoSelect) { |
|
|
287 | 287 | this.selectEntry(); |
|
|
288 | 288 | this.hide(); |
| @@ -298,7 +298,7 | |||
|
|
298 | 298 | }, |
|
|
299 | 299 | |
|
|
300 | 300 | onObserverEvent: function() { |
|
|
301 |
- this.changed = false; |
|
|
|
301 | + this.changed = false; | |
|
|
302 | 302 | this.tokenBounds = null; |
|
|
303 | 303 | if(this.getToken().length>=this.options.minChars) { |
|
|
304 | 304 | this.getUpdatedChoices(); |
| @@ -351,16 +351,16 | |||
|
|
351 | 351 | |
|
|
352 | 352 | getUpdatedChoices: function() { |
|
|
353 | 353 | this.startIndicator(); |
|
|
354 | - | |
|
|
355 |
- var entry = encodeURIComponent(this.options.paramName) + '=' + |
|
|
|
354 | + | |
|
|
355 | + var entry = encodeURIComponent(this.options.paramName) + '=' + | |
|
|
356 | 356 | encodeURIComponent(this.getToken()); |
|
|
357 | 357 | |
|
|
358 | 358 | this.options.parameters = this.options.callback ? |
|
|
359 | 359 | this.options.callback(this.element, entry) : entry; |
|
|
360 | 360 | |
|
|
361 |
- if(this.options.defaultParams) |
|
|
|
361 | + if(this.options.defaultParams) | |
|
|
362 | 362 | this.options.parameters += '&' + this.options.defaultParams; |
|
|
363 | - | |
|
|
363 | + | |
|
|
364 | 364 | new Ajax.Request(this.url, this.options); |
|
|
365 | 365 | }, |
|
|
366 | 366 | |
| @@ -382,7 +382,7 | |||
|
|
382 | 382 | // - choices - How many autocompletion choices to offer |
|
|
383 | 383 | // |
|
|
384 | 384 | // - partialSearch - If false, the autocompleter will match entered |
|
|
385 |
- // text only at the beginning of strings in the |
|
|
|
385 | + // text only at the beginning of strings in the | |
|
|
386 | 386 | // autocomplete array. Defaults to true, which will |
|
|
387 | 387 | // match text at the beginning of any *word* in the |
|
|
388 | 388 | // strings in the autocomplete array. If you want to |
| @@ -399,7 +399,7 | |||
|
|
399 | 399 | // - ignoreCase - Whether to ignore case when autocompleting. |
|
|
400 | 400 | // Defaults to true. |
|
|
401 | 401 | // |
|
|
402 |
- // It's possible to pass in a custom function as the 'selector' |
|
|
|
402 | + // It's possible to pass in a custom function as the 'selector' | |
|
|
403 | 403 | // option, if you prefer to write your own autocompletion logic. |
|
|
404 | 404 | // In that case, the other options above will not apply unless |
|
|
405 | 405 | // you support them. |
| @@ -427,20 +427,20 | |||
|
|
427 | 427 | var entry = instance.getToken(); |
|
|
428 | 428 | var count = 0; |
|
|
429 | 429 | |
|
|
430 |
- for (var i = 0; i < instance.options.array.length && |
|
|
|
431 |
- ret.length < instance.options.choices ; i++) { |
|
|
|
430 | + for (var i = 0; i < instance.options.array.length && | |
|
|
431 | + ret.length < instance.options.choices ; i++) { | |
|
|
432 | 432 | |
|
|
433 | 433 | var elem = instance.options.array[i]; |
|
|
434 |
- var foundPos = instance.options.ignoreCase ? |
|
|
|
435 |
- elem.toLowerCase().indexOf(entry.toLowerCase()) : |
|
|
|
434 | + var foundPos = instance.options.ignoreCase ? | |
|
|
435 | + elem.toLowerCase().indexOf(entry.toLowerCase()) : | |
|
|
436 | 436 | elem.indexOf(entry); |
|
|
437 | 437 | |
|
|
438 | 438 | while (foundPos != -1) { |
|
|
439 |
- if (foundPos == 0 && elem.length != entry.length) { |
|
|
|
440 |
- ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + |
|
|
|
439 | + if (foundPos == 0 && elem.length != entry.length) { | |
|
|
440 | + ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + | |
|
|
441 | 441 | elem.substr(entry.length) + "</li>"); |
|
|
442 | 442 | break; |
|
|
443 |
- } else if (entry.length >= instance.options.partialChars && |
|
|
|
443 | + } else if (entry.length >= instance.options.partialChars && | |
|
|
444 | 444 | instance.options.partialSearch && foundPos != -1) { |
|
|
445 | 445 | if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) { |
|
|
446 | 446 | partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" + |
| @@ -450,14 +450,14 | |||
|
|
450 | 450 | } |
|
|
451 | 451 | } |
|
|
452 | 452 | |
|
|
453 |
- foundPos = instance.options.ignoreCase ? |
|
|
|
454 |
- elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : |
|
|
|
453 | + foundPos = instance.options.ignoreCase ? | |
|
|
454 | + elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : | |
|
|
455 | 455 | elem.indexOf(entry, foundPos + 1); |
|
|
456 | 456 | |
|
|
457 | 457 | } |
|
|
458 | 458 | } |
|
|
459 | 459 | if (partial.length) |
|
|
460 | - ret = ret.concat(partial.slice(0, instance.options.choices - ret.length)) | |
|
|
460 | + ret = ret.concat(partial.slice(0, instance.options.choices - ret.length)); | |
|
|
461 | 461 | return "<ul>" + ret.join('') + "</ul>"; |
|
|
462 | 462 | } |
|
|
463 | 463 | }, options || { }); |
| @@ -474,7 +474,7 | |||
|
|
474 | 474 | setTimeout(function() { |
|
|
475 | 475 | Field.activate(field); |
|
|
476 | 476 | }, 1); |
|
|
477 | - } | |
|
|
477 | + }; | |
|
|
478 | 478 | |
|
|
479 | 479 | Ajax.InPlaceEditor = Class.create({ |
|
|
480 | 480 | initialize: function(element, url, options) { |
| @@ -604,7 +604,7 | |||
|
|
604 | 604 | this.triggerCallback('onEnterHover'); |
|
|
605 | 605 | }, |
|
|
606 | 606 | getText: function() { |
|
|
607 | - return this.element.innerHTML; | |
|
|
607 | + return this.element.innerHTML.unescapeHTML(); | |
|
|
608 | 608 | }, |
|
|
609 | 609 | handleAJAXFailure: function(transport) { |
|
|
610 | 610 | this.triggerCallback('onFailure', transport); |
| @@ -780,7 +780,7 | |||
|
|
780 | 780 | onSuccess: function(transport) { |
|
|
781 | 781 | var js = transport.responseText.strip(); |
|
|
782 | 782 | if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check |
|
|
783 |
- throw |
|
|
|
783 | + throw('Server returned an invalid collection representation.'); | |
|
|
784 | 784 | this._collection = eval(js); |
|
|
785 | 785 | this.checkForExternalText(); |
|
|
786 | 786 | }.bind(this), |
| @@ -937,7 +937,7 | |||
|
|
937 | 937 | loadingCollectionText: 'Loading options...' |
|
|
938 | 938 | }; |
|
|
939 | 939 | |
|
|
940 |
- // Delayed observer, like Form.Element.Observer, |
|
|
|
940 | + // Delayed observer, like Form.Element.Observer, | |
|
|
941 | 941 | // but waits for delay after last key input |
|
|
942 | 942 | // Ideal for live-search fields |
|
|
943 | 943 | |
| @@ -947,7 +947,7 | |||
|
|
947 | 947 | this.element = $(element); |
|
|
948 | 948 | this.callback = callback; |
|
|
949 | 949 | this.timer = null; |
|
|
950 |
- this.lastValue = $F(this.element); |
|
|
|
950 | + this.lastValue = $F(this.element); | |
|
|
951 | 951 | Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this)); |
|
|
952 | 952 | }, |
|
|
953 | 953 | delayedListener: function(event) { |
| @@ -960,4 +960,4 | |||
|
|
960 | 960 | this.timer = null; |
|
|
961 | 961 | this.callback(this.element, $F(this.element)); |
|
|
962 | 962 | } |
|
|
963 |
- }); |
|
|
|
963 | + }); No newline at end of file | |
| @@ -1,6 +1,6 | |||
|
|
1 | 1 | // Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) |
|
|
2 |
- // (c) 2005-200 |
|
|
|
3 |
- // |
|
|
|
2 | + // (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz) | |
|
|
3 | + // | |
|
|
4 | 4 | // script.aculo.us is freely distributable under the terms of an MIT-style license. |
|
|
5 | 5 | // For details, see the script.aculo.us web site: http://script.aculo.us/ |
|
|
6 | 6 | |
| @@ -32,7 +32,7 | |||
|
|
32 | 32 | options._containers.push($(containment)); |
|
|
33 | 33 | } |
|
|
34 | 34 | } |
|
|
35 | - | |
|
|
35 | + | |
|
|
36 | 36 | if(options.accept) options.accept = [options.accept].flatten(); |
|
|
37 | 37 | |
|
|
38 | 38 | Element.makePositioned(element); // fix IE |
| @@ -40,34 +40,34 | |||
|
|
40 | 40 | |
|
|
41 | 41 | this.drops.push(options); |
|
|
42 | 42 | }, |
|
|
43 | - | |
|
|
43 | + | |
|
|
44 | 44 | findDeepestChild: function(drops) { |
|
|
45 | 45 | deepest = drops[0]; |
|
|
46 | - | |
|
|
46 | + | |
|
|
47 | 47 | for (i = 1; i < drops.length; ++i) |
|
|
48 | 48 | if (Element.isParent(drops[i].element, deepest.element)) |
|
|
49 | 49 | deepest = drops[i]; |
|
|
50 | - | |
|
|
50 | + | |
|
|
51 | 51 | return deepest; |
|
|
52 | 52 | }, |
|
|
53 | 53 | |
|
|
54 | 54 | isContained: function(element, drop) { |
|
|
55 | 55 | var containmentNode; |
|
|
56 | 56 | if(drop.tree) { |
|
|
57 |
- containmentNode = element.treeNode; |
|
|
|
57 | + containmentNode = element.treeNode; | |
|
|
58 | 58 | } else { |
|
|
59 | 59 | containmentNode = element.parentNode; |
|
|
60 | 60 | } |
|
|
61 | 61 | return drop._containers.detect(function(c) { return containmentNode == c }); |
|
|
62 | 62 | }, |
|
|
63 | - | |
|
|
63 | + | |
|
|
64 | 64 | isAffected: function(point, element, drop) { |
|
|
65 | 65 | return ( |
|
|
66 | 66 | (drop.element!=element) && |
|
|
67 | 67 | ((!drop._containers) || |
|
|
68 | 68 | this.isContained(element, drop)) && |
|
|
69 | 69 | ((!drop.accept) || |
|
|
70 |
- (Element.classNames(element).detect( |
|
|
|
70 | + (Element.classNames(element).detect( | |
|
|
71 | 71 | function(v) { return drop.accept.include(v) } ) )) && |
|
|
72 | 72 | Position.within(drop.element, point[0], point[1]) ); |
|
|
73 | 73 | }, |
| @@ -87,12 +87,12 | |||
|
|
87 | 87 | show: function(point, element) { |
|
|
88 | 88 | if(!this.drops.length) return; |
|
|
89 | 89 | var drop, affected = []; |
|
|
90 | - | |
|
|
90 | + | |
|
|
91 | 91 | this.drops.each( function(drop) { |
|
|
92 | 92 | if(Droppables.isAffected(point, element, drop)) |
|
|
93 | 93 | affected.push(drop); |
|
|
94 | 94 | }); |
|
|
95 | - | |
|
|
95 | + | |
|
|
96 | 96 | if(affected.length>0) |
|
|
97 | 97 | drop = Droppables.findDeepestChild(affected); |
|
|
98 | 98 | |
| @@ -101,7 +101,7 | |||
|
|
101 | 101 | Position.within(drop.element, point[0], point[1]); |
|
|
102 | 102 | if(drop.onHover) |
|
|
103 | 103 | drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element)); |
|
|
104 | - | |
|
|
104 | + | |
|
|
105 | 105 | if (drop != this.last_active) Droppables.activate(drop); |
|
|
106 | 106 | } |
|
|
107 | 107 | }, |
| @@ -112,8 +112,8 | |||
|
|
112 | 112 | |
|
|
113 | 113 | if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active)) |
|
|
114 | 114 | if (this.last_active.onDrop) { |
|
|
115 |
- this.last_active.onDrop(element, this.last_active.element, event); |
|
|
|
116 |
- return true; |
|
|
|
115 | + this.last_active.onDrop(element, this.last_active.element, event); | |
|
|
116 | + return true; | |
|
|
117 | 117 | } |
|
|
118 | 118 | }, |
|
|
119 | 119 | |
| @@ -121,25 +121,25 | |||
|
|
121 | 121 | if(this.last_active) |
|
|
122 | 122 | this.deactivate(this.last_active); |
|
|
123 | 123 | } |
|
|
124 | - } | |
|
|
124 | + }; | |
|
|
125 | 125 | |
|
|
126 | 126 | var Draggables = { |
|
|
127 | 127 | drags: [], |
|
|
128 | 128 | observers: [], |
|
|
129 | - | |
|
|
129 | + | |
|
|
130 | 130 | register: function(draggable) { |
|
|
131 | 131 | if(this.drags.length == 0) { |
|
|
132 | 132 | this.eventMouseUp = this.endDrag.bindAsEventListener(this); |
|
|
133 | 133 | this.eventMouseMove = this.updateDrag.bindAsEventListener(this); |
|
|
134 | 134 | this.eventKeypress = this.keyPress.bindAsEventListener(this); |
|
|
135 | - | |
|
|
135 | + | |
|
|
136 | 136 | Event.observe(document, "mouseup", this.eventMouseUp); |
|
|
137 | 137 | Event.observe(document, "mousemove", this.eventMouseMove); |
|
|
138 | 138 | Event.observe(document, "keypress", this.eventKeypress); |
|
|
139 | 139 | } |
|
|
140 | 140 | this.drags.push(draggable); |
|
|
141 | 141 | }, |
|
|
142 | - | |
|
|
142 | + | |
|
|
143 | 143 | unregister: function(draggable) { |
|
|
144 | 144 | this.drags = this.drags.reject(function(d) { return d==draggable }); |
|
|
145 | 145 | if(this.drags.length == 0) { |
| @@ -148,24 +148,24 | |||
|
|
148 | 148 | Event.stopObserving(document, "keypress", this.eventKeypress); |
|
|
149 | 149 | } |
|
|
150 | 150 | }, |
|
|
151 | - | |
|
|
151 | + | |
|
|
152 | 152 | activate: function(draggable) { |
|
|
153 |
- if(draggable.options.delay) { |
|
|
|
154 |
- this._timeout = setTimeout(function() { |
|
|
|
155 |
- Draggables._timeout = null; |
|
|
|
156 |
- window.focus(); |
|
|
|
157 |
- Draggables.activeDraggable = draggable; |
|
|
|
158 |
- }.bind(this), draggable.options.delay); |
|
|
|
153 | + if(draggable.options.delay) { | |
|
|
154 | + this._timeout = setTimeout(function() { | |
|
|
155 | + Draggables._timeout = null; | |
|
|
156 | + window.focus(); | |
|
|
157 | + Draggables.activeDraggable = draggable; | |
|
|
158 | + }.bind(this), draggable.options.delay); | |
|
|
159 | 159 | } else { |
|
|
160 | 160 | window.focus(); // allows keypress events if window isn't currently focused, fails for Safari |
|
|
161 | 161 | this.activeDraggable = draggable; |
|
|
162 | 162 | } |
|
|
163 | 163 | }, |
|
|
164 | - | |
|
|
164 | + | |
|
|
165 | 165 | deactivate: function() { |
|
|
166 | 166 | this.activeDraggable = null; |
|
|
167 | 167 | }, |
|
|
168 | - | |
|
|
168 | + | |
|
|
169 | 169 | updateDrag: function(event) { |
|
|
170 | 170 | if(!this.activeDraggable) return; |
|
|
171 | 171 | var pointer = [Event.pointerX(event), Event.pointerY(event)]; |
| @@ -173,36 +173,36 | |||
|
|
173 | 173 | // the same coordinates, prevent needless redrawing (moz bug?) |
|
|
174 | 174 | if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return; |
|
|
175 | 175 | this._lastPointer = pointer; |
|
|
176 | - | |
|
|
176 | + | |
|
|
177 | 177 | this.activeDraggable.updateDrag(event, pointer); |
|
|
178 | 178 | }, |
|
|
179 | - | |
|
|
179 | + | |
|
|
180 | 180 | endDrag: function(event) { |
|
|
181 |
- if(this._timeout) { |
|
|
|
182 |
- clearTimeout(this._timeout); |
|
|
|
183 |
- this._timeout = null; |
|
|
|
181 | + if(this._timeout) { | |
|
|
182 | + clearTimeout(this._timeout); | |
|
|
183 | + this._timeout = null; | |
|
|
184 | 184 | } |
|
|
185 | 185 | if(!this.activeDraggable) return; |
|
|
186 | 186 | this._lastPointer = null; |
|
|
187 | 187 | this.activeDraggable.endDrag(event); |
|
|
188 | 188 | this.activeDraggable = null; |
|
|
189 | 189 | }, |
|
|
190 | - | |
|
|
190 | + | |
|
|
191 | 191 | keyPress: function(event) { |
|
|
192 | 192 | if(this.activeDraggable) |
|
|
193 | 193 | this.activeDraggable.keyPress(event); |
|
|
194 | 194 | }, |
|
|
195 | - | |
|
|
195 | + | |
|
|
196 | 196 | addObserver: function(observer) { |
|
|
197 | 197 | this.observers.push(observer); |
|
|
198 | 198 | this._cacheObserverCallbacks(); |
|
|
199 | 199 | }, |
|
|
200 | - | |
|
|
200 | + | |
|
|
201 | 201 | removeObserver: function(element) { // element instead of observer fixes mem leaks |
|
|
202 | 202 | this.observers = this.observers.reject( function(o) { return o.element==element }); |
|
|
203 | 203 | this._cacheObserverCallbacks(); |
|
|
204 | 204 | }, |
|
|
205 | - | |
|
|
205 | + | |
|
|
206 | 206 | notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag' |
|
|
207 | 207 | if(this[eventName+'Count'] > 0) |
|
|
208 | 208 | this.observers.each( function(o) { |
| @@ -210,7 +210,7 | |||
|
|
210 | 210 | }); |
|
|
211 | 211 | if(draggable.options[eventName]) draggable.options[eventName](draggable, event); |
|
|
212 | 212 | }, |
|
|
213 | - | |
|
|
213 | + | |
|
|
214 | 214 | _cacheObserverCallbacks: function() { |
|
|
215 | 215 | ['onStart','onEnd','onDrag'].each( function(eventName) { |
|
|
216 | 216 | Draggables[eventName+'Count'] = Draggables.observers.select( |
| @@ -218,7 +218,7 | |||
|
|
218 | 218 | ).length; |
|
|
219 | 219 | }); |
|
|
220 | 220 | } |
|
|
221 | - } | |
|
|
221 | + }; | |
|
|
222 | 222 | |
|
|
223 | 223 |
|
|
|
224 | 224 | |
| @@ -234,12 +234,12 | |||
|
|
234 | 234 | }, |
|
|
235 | 235 | endeffect: function(element) { |
|
|
236 | 236 | var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0; |
|
|
237 |
- new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, |
|
|
|
237 | + new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, | |
|
|
238 | 238 | queue: {scope:'_draggable', position:'end'}, |
|
|
239 |
- afterFinish: function(){ |
|
|
|
240 |
- Draggable._dragging[element] = false |
|
|
|
239 | + afterFinish: function(){ | |
|
|
240 | + Draggable._dragging[element] = false | |
|
|
241 | 241 | } |
|
|
242 |
- }); |
|
|
|
242 | + }); | |
|
|
243 | 243 | }, |
|
|
244 | 244 | zindex: 1000, |
|
|
245 | 245 | revert: false, |
| @@ -250,57 +250,57 | |||
|
|
250 | 250 | snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] } |
|
|
251 | 251 | delay: 0 |
|
|
252 | 252 | }; |
|
|
253 | - | |
|
|
253 | + | |
|
|
254 | 254 | if(!arguments[1] || Object.isUndefined(arguments[1].endeffect)) |
|
|
255 | 255 | Object.extend(defaults, { |
|
|
256 | 256 | starteffect: function(element) { |
|
|
257 | 257 | element._opacity = Element.getOpacity(element); |
|
|
258 | 258 | Draggable._dragging[element] = true; |
|
|
259 |
- new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); |
|
|
|
259 | + new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); | |
|
|
260 | 260 | } |
|
|
261 | 261 | }); |
|
|
262 | - | |
|
|
262 | + | |
|
|
263 | 263 | var options = Object.extend(defaults, arguments[1] || { }); |
|
|
264 | 264 | |
|
|
265 | 265 | this.element = $(element); |
|
|
266 | - | |
|
|
266 | + | |
|
|
267 | 267 | if(options.handle && Object.isString(options.handle)) |
|
|
268 | 268 | this.handle = this.element.down('.'+options.handle, 0); |
|
|
269 | - | |
|
|
269 | + | |
|
|
270 | 270 | if(!this.handle) this.handle = $(options.handle); |
|
|
271 | 271 | if(!this.handle) this.handle = this.element; |
|
|
272 | - | |
|
|
272 | + | |
|
|
273 | 273 | if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) { |
|
|
274 | 274 | options.scroll = $(options.scroll); |
|
|
275 | 275 | this._isScrollChild = Element.childOf(this.element, options.scroll); |
|
|
276 | 276 | } |
|
|
277 | 277 | |
|
|
278 |
- Element.makePositioned(this.element); // fix IE |
|
|
|
278 | + Element.makePositioned(this.element); // fix IE | |
|
|
279 | 279 | |
|
|
280 | 280 | this.options = options; |
|
|
281 |
- this.dragging = false; |
|
|
|
281 | + this.dragging = false; | |
|
|
282 | 282 | |
|
|
283 | 283 | this.eventMouseDown = this.initDrag.bindAsEventListener(this); |
|
|
284 | 284 | Event.observe(this.handle, "mousedown", this.eventMouseDown); |
|
|
285 | - | |
|
|
285 | + | |
|
|
286 | 286 | Draggables.register(this); |
|
|
287 | 287 | }, |
|
|
288 | - | |
|
|
288 | + | |
|
|
289 | 289 | destroy: function() { |
|
|
290 | 290 | Event.stopObserving(this.handle, "mousedown", this.eventMouseDown); |
|
|
291 | 291 | Draggables.unregister(this); |
|
|
292 | 292 | }, |
|
|
293 | - | |
|
|
293 | + | |
|
|
294 | 294 | currentDelta: function() { |
|
|
295 | 295 | return([ |
|
|
296 | 296 | parseInt(Element.getStyle(this.element,'left') || '0'), |
|
|
297 | 297 | parseInt(Element.getStyle(this.element,'top') || '0')]); |
|
|
298 | 298 | }, |
|
|
299 | - | |
|
|
299 | + | |
|
|
300 | 300 | initDrag: function(event) { |
|
|
301 | 301 | if(!Object.isUndefined(Draggable._dragging[this.element]) && |
|
|
302 | 302 | Draggable._dragging[this.element]) return; |
|
|
303 |
- if(Event.isLeftClick(event)) { |
|
|
|
303 | + if(Event.isLeftClick(event)) { | |
|
|
304 | 304 | // abort on form elements, fixes a Firefox issue |
|
|
305 | 305 | var src = Event.element(event); |
|
|
306 | 306 | if((tag_name = src.tagName.toUpperCase()) && ( |
| @@ -309,34 +309,34 | |||
|
|
309 | 309 | tag_name=='OPTION' || |
|
|
310 | 310 | tag_name=='BUTTON' || |
|
|
311 | 311 | tag_name=='TEXTAREA')) return; |
|
|
312 | - | |
|
|
312 | + | |
|
|
313 | 313 | var pointer = [Event.pointerX(event), Event.pointerY(event)]; |
|
|
314 | 314 | var pos = Position.cumulativeOffset(this.element); |
|
|
315 | 315 | this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) }); |
|
|
316 | - | |
|
|
316 | + | |
|
|
317 | 317 | Draggables.activate(this); |
|
|
318 | 318 | Event.stop(event); |
|
|
319 | 319 | } |
|
|
320 | 320 | }, |
|
|
321 | - | |
|
|
321 | + | |
|
|
322 | 322 | startDrag: function(event) { |
|
|
323 | 323 | this.dragging = true; |
|
|
324 | 324 | if(!this.delta) |
|
|
325 | 325 | this.delta = this.currentDelta(); |
|
|
326 | - | |
|
|
326 | + | |
|
|
327 | 327 | if(this.options.zindex) { |
|
|
328 | 328 | this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0); |
|
|
329 | 329 | this.element.style.zIndex = this.options.zindex; |
|
|
330 | 330 | } |
|
|
331 | - | |
|
|
331 | + | |
|
|
332 | 332 | if(this.options.ghosting) { |
|
|
333 | 333 | this._clone = this.element.cloneNode(true); |
|
|
334 |
- this |
|
|
|
335 |
- if (!this. |
|
|
|
334 | + this._originallyAbsolute = (this.element.getStyle('position') == 'absolute'); | |
|
|
335 | + if (!this._originallyAbsolute) | |
|
|
336 | 336 | Position.absolutize(this.element); |
|
|
337 | 337 | this.element.parentNode.insertBefore(this._clone, this.element); |
|
|
338 | 338 | } |
|
|
339 | - | |
|
|
339 | + | |
|
|
340 | 340 | if(this.options.scroll) { |
|
|
341 | 341 | if (this.options.scroll == window) { |
|
|
342 | 342 | var where = this._getWindowScroll(this.options.scroll); |
| @@ -347,28 +347,28 | |||
|
|
347 | 347 | this.originalScrollTop = this.options.scroll.scrollTop; |
|
|
348 | 348 | } |
|
|
349 | 349 | } |
|
|
350 | - | |
|
|
350 | + | |
|
|
351 | 351 | Draggables.notify('onStart', this, event); |
|
|
352 | - | |
|
|
352 | + | |
|
|
353 | 353 | if(this.options.starteffect) this.options.starteffect(this.element); |
|
|
354 | 354 | }, |
|
|
355 | - | |
|
|
355 | + | |
|
|
356 | 356 | updateDrag: function(event, pointer) { |
|
|
357 | 357 | if(!this.dragging) this.startDrag(event); |
|
|
358 | - | |
|
|
358 | + | |
|
|
359 | 359 | if(!this.options.quiet){ |
|
|
360 | 360 | Position.prepare(); |
|
|
361 | 361 | Droppables.show(pointer, this.element); |
|
|
362 | 362 | } |
|
|
363 | - | |
|
|
363 | + | |
|
|
364 | 364 | Draggables.notify('onDrag', this, event); |
|
|
365 | - | |
|
|
365 | + | |
|
|
366 | 366 | this.draw(pointer); |
|
|
367 | 367 | if(this.options.change) this.options.change(this); |
|
|
368 | - | |
|
|
368 | + | |
|
|
369 | 369 | if(this.options.scroll) { |
|
|
370 | 370 | this.stopScrolling(); |
|
|
371 | - | |
|
|
371 | + | |
|
|
372 | 372 | var p; |
|
|
373 | 373 | if (this.options.scroll == window) { |
|
|
374 | 374 | with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; } |
| @@ -386,16 +386,16 | |||
|
|
386 | 386 | if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity); |
|
|
387 | 387 | this.startScrolling(speed); |
|
|
388 | 388 | } |
|
|
389 | - | |
|
|
389 | + | |
|
|
390 | 390 | // fix AppleWebKit rendering |
|
|
391 | 391 | if(Prototype.Browser.WebKit) window.scrollBy(0,0); |
|
|
392 | - | |
|
|
392 | + | |
|
|
393 | 393 | Event.stop(event); |
|
|
394 | 394 | }, |
|
|
395 | - | |
|
|
395 | + | |
|
|
396 | 396 | finishDrag: function(event, success) { |
|
|
397 | 397 | this.dragging = false; |
|
|
398 | - | |
|
|
398 | + | |
|
|
399 | 399 | if(this.options.quiet){ |
|
|
400 | 400 | Position.prepare(); |
|
|
401 | 401 | var pointer = [Event.pointerX(event), Event.pointerY(event)]; |
| @@ -403,24 +403,24 | |||
|
|
403 | 403 | } |
|
|
404 | 404 | |
|
|
405 | 405 | if(this.options.ghosting) { |
|
|
406 |
- if (!this. |
|
|
|
406 | + if (!this._originallyAbsolute) | |
|
|
407 | 407 | Position.relativize(this.element); |
|
|
408 |
- delete this. |
|
|
|
408 | + delete this._originallyAbsolute; | |
|
|
409 | 409 | Element.remove(this._clone); |
|
|
410 | 410 | this._clone = null; |
|
|
411 | 411 | } |
|
|
412 | 412 | |
|
|
413 |
- var dropped = false; |
|
|
|
414 |
- if(success) { |
|
|
|
415 |
- dropped = Droppables.fire(event, this.element); |
|
|
|
416 |
- if (!dropped) dropped = false; |
|
|
|
413 | + var dropped = false; | |
|
|
414 | + if(success) { | |
|
|
415 | + dropped = Droppables.fire(event, this.element); | |
|
|
416 | + if (!dropped) dropped = false; | |
|
|
417 | 417 | } |
|
|
418 | 418 | if(dropped && this.options.onDropped) this.options.onDropped(this.element); |
|
|
419 | 419 | Draggables.notify('onEnd', this, event); |
|
|
420 | 420 | |
|
|
421 | 421 | var revert = this.options.revert; |
|
|
422 | 422 | if(revert && Object.isFunction(revert)) revert = revert(this.element); |
|
|
423 | - | |
|
|
423 | + | |
|
|
424 | 424 | var d = this.currentDelta(); |
|
|
425 | 425 | if(revert && this.options.reverteffect) { |
|
|
426 | 426 | if (dropped == 0 || revert != 'failure') |
| @@ -433,67 +433,67 | |||
|
|
433 | 433 | if(this.options.zindex) |
|
|
434 | 434 | this.element.style.zIndex = this.originalZ; |
|
|
435 | 435 | |
|
|
436 |
- if(this.options.endeffect) |
|
|
|
436 | + if(this.options.endeffect) | |
|
|
437 | 437 | this.options.endeffect(this.element); |
|
|
438 | - | |
|
|
438 | + | |
|
|
439 | 439 | Draggables.deactivate(this); |
|
|
440 | 440 | Droppables.reset(); |
|
|
441 | 441 | }, |
|
|
442 | - | |
|
|
442 | + | |
|
|
443 | 443 | keyPress: function(event) { |
|
|
444 | 444 | if(event.keyCode!=Event.KEY_ESC) return; |
|
|
445 | 445 | this.finishDrag(event, false); |
|
|
446 | 446 | Event.stop(event); |
|
|
447 | 447 | }, |
|
|
448 | - | |
|
|
448 | + | |
|
|
449 | 449 | endDrag: function(event) { |
|
|
450 | 450 | if(!this.dragging) return; |
|
|
451 | 451 | this.stopScrolling(); |
|
|
452 | 452 | this.finishDrag(event, true); |
|
|
453 | 453 | Event.stop(event); |
|
|
454 | 454 | }, |
|
|
455 | - | |
|
|
455 | + | |
|
|
456 | 456 | draw: function(point) { |
|
|
457 | 457 | var pos = Position.cumulativeOffset(this.element); |
|
|
458 | 458 | if(this.options.ghosting) { |
|
|
459 | 459 | var r = Position.realOffset(this.element); |
|
|
460 | 460 | pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY; |
|
|
461 | 461 | } |
|
|
462 | - | |
|
|
462 | + | |
|
|
463 | 463 | var d = this.currentDelta(); |
|
|
464 | 464 | pos[0] -= d[0]; pos[1] -= d[1]; |
|
|
465 | - | |
|
|
465 | + | |
|
|
466 | 466 | if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) { |
|
|
467 | 467 | pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft; |
|
|
468 | 468 | pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop; |
|
|
469 | 469 | } |
|
|
470 | - | |
|
|
471 |
- var p = [0,1].map(function(i){ |
|
|
|
472 |
- return (point[i]-pos[i]-this.offset[i]) |
|
|
|
470 | + | |
|
|
471 | + var p = [0,1].map(function(i){ | |
|
|
472 | + return (point[i]-pos[i]-this.offset[i]) | |
|
|
473 | 473 | }.bind(this)); |
|
|
474 | - | |
|
|
474 | + | |
|
|
475 | 475 | if(this.options.snap) { |
|
|
476 | 476 | if(Object.isFunction(this.options.snap)) { |
|
|
477 | 477 | p = this.options.snap(p[0],p[1],this); |
|
|
478 | 478 | } else { |
|
|
479 | 479 | if(Object.isArray(this.options.snap)) { |
|
|
480 | 480 | p = p.map( function(v, i) { |
|
|
481 | - return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this)) | |
|
|
481 | + return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this)); | |
|
|
482 | 482 | } else { |
|
|
483 | 483 | p = p.map( function(v) { |
|
|
484 | - return (v/this.options.snap).round()*this.options.snap }.bind(this)) | |
|
|
484 | + return (v/this.options.snap).round()*this.options.snap }.bind(this)); | |
|
|
485 | 485 | } |
|
|
486 | 486 | }} |
|
|
487 | - | |
|
|
487 | + | |
|
|
488 | 488 | var style = this.element.style; |
|
|
489 | 489 | if((!this.options.constraint) || (this.options.constraint=='horizontal')) |
|
|
490 | 490 | style.left = p[0] + "px"; |
|
|
491 | 491 | if((!this.options.constraint) || (this.options.constraint=='vertical')) |
|
|
492 | 492 | style.top = p[1] + "px"; |
|
|
493 | - | |
|
|
493 | + | |
|
|
494 | 494 | if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering |
|
|
495 | 495 | }, |
|
|
496 | - | |
|
|
496 | + | |
|
|
497 | 497 | stopScrolling: function() { |
|
|
498 | 498 | if(this.scrollInterval) { |
|
|
499 | 499 | clearInterval(this.scrollInterval); |
| @@ -501,14 +501,14 | |||
|
|
501 | 501 | Draggables._lastScrollPointer = null; |
|
|
502 | 502 | } |
|
|
503 | 503 | }, |
|
|
504 | - | |
|
|
504 | + | |
|
|
505 | 505 | startScrolling: function(speed) { |
|
|
506 | 506 | if(!(speed[0] || speed[1])) return; |
|
|
507 | 507 | this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed]; |
|
|
508 | 508 | this.lastScrolled = new Date(); |
|
|
509 | 509 | this.scrollInterval = setInterval(this.scroll.bind(this), 10); |
|
|
510 | 510 | }, |
|
|
511 | - | |
|
|
511 | + | |
|
|
512 | 512 | scroll: function() { |
|
|
513 | 513 | var current = new Date(); |
|
|
514 | 514 | var delta = current - this.lastScrolled; |
| @@ -524,7 +524,7 | |||
|
|
524 | 524 | this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000; |
|
|
525 | 525 | this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000; |
|
|
526 | 526 | } |
|
|
527 | - | |
|
|
527 | + | |
|
|
528 | 528 | Position.prepare(); |
|
|
529 | 529 | Droppables.show(Draggables._lastPointer, this.element); |
|
|
530 | 530 | Draggables.notify('onDrag', this); |
| @@ -538,10 +538,10 | |||
|
|
538 | 538 | Draggables._lastScrollPointer[1] = 0; |
|
|
539 | 539 | this.draw(Draggables._lastScrollPointer); |
|
|
540 | 540 | } |
|
|
541 | - | |
|
|
541 | + | |
|
|
542 | 542 | if(this.options.change) this.options.change(this); |
|
|
543 | 543 | }, |
|
|
544 | - | |
|
|
544 | + | |
|
|
545 | 545 | _getWindowScroll: function(w) { |
|
|
546 | 546 | var T, L, W, H; |
|
|
547 | 547 | with (w.document) { |
| @@ -560,7 +560,7 | |||
|
|
560 | 560 | H = documentElement.clientHeight; |
|
|
561 | 561 | } else { |
|
|
562 | 562 | W = body.offsetWidth; |
|
|
563 | - H = body.offsetHeight | |
|
|
563 | + H = body.offsetHeight; | |
|
|
564 | 564 | } |
|
|
565 | 565 | } |
|
|
566 | 566 | return { top: T, left: L, width: W, height: H }; |
| @@ -577,11 +577,11 | |||
|
|
577 | 577 | this.observer = observer; |
|
|
578 | 578 | this.lastValue = Sortable.serialize(this.element); |
|
|
579 | 579 | }, |
|
|
580 | - | |
|
|
580 | + | |
|
|
581 | 581 | onStart: function() { |
|
|
582 | 582 | this.lastValue = Sortable.serialize(this.element); |
|
|
583 | 583 | }, |
|
|
584 | - | |
|
|
584 | + | |
|
|
585 | 585 | onEnd: function() { |
|
|
586 | 586 | Sortable.unmark(); |
|
|
587 | 587 | if(this.lastValue != Sortable.serialize(this.element)) |
| @@ -591,11 +591,11 | |||
|
|
591 | 591 | |
|
|
592 | 592 | var Sortable = { |
|
|
593 | 593 | SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/, |
|
|
594 | - | |
|
|
594 | + | |
|
|
595 | 595 | sortables: { }, |
|
|
596 | - | |
|
|
596 | + | |
|
|
597 | 597 | _findRootElement: function(element) { |
|
|
598 |
- while (element.tagName.toUpperCase() != "BODY") { |
|
|
|
598 | + while (element.tagName.toUpperCase() != "BODY") { | |
|
|
599 | 599 | if(element.id && Sortable.sortables[element.id]) return element; |
|
|
600 | 600 | element = element.parentNode; |
|
|
601 | 601 | } |
| @@ -606,22 +606,23 | |||
|
|
606 | 606 | if(!element) return; |
|
|
607 | 607 | return Sortable.sortables[element.id]; |
|
|
608 | 608 | }, |
|
|
609 | - | |
|
|
609 | + | |
|
|
610 | 610 | destroy: function(element){ |
|
|
611 | - var s = Sortable.options(element); | |
|
|
612 | - | |
|
|
611 | + element = $(element); | |
|
|
612 | + var s = Sortable.sortables[element.id]; | |
|
|
613 | + | |
|
|
613 | 614 | if(s) { |
|
|
614 | 615 | Draggables.removeObserver(s.element); |
|
|
615 | 616 | s.droppables.each(function(d){ Droppables.remove(d) }); |
|
|
616 | 617 | s.draggables.invoke('destroy'); |
|
|
617 | - | |
|
|
618 | + | |
|
|
618 | 619 | delete Sortable.sortables[s.element.id]; |
|
|
619 | 620 | } |
|
|
620 | 621 | }, |
|
|
621 | 622 | |
|
|
622 | 623 | create: function(element) { |
|
|
623 | 624 | element = $(element); |
|
|
624 |
- var options = Object.extend({ |
|
|
|
625 | + var options = Object.extend({ | |
|
|
625 | 626 | element: element, |
|
|
626 | 627 | tag: 'li', // assumes li children, override with tag: 'tagname' |
|
|
627 | 628 | dropOnEmpty: false, |
| @@ -635,17 +636,17 | |||
|
|
635 | 636 | delay: 0, |
|
|
636 | 637 | hoverclass: null, |
|
|
637 | 638 | ghosting: false, |
|
|
638 |
- quiet: false, |
|
|
|
639 | + quiet: false, | |
|
|
639 | 640 | scroll: false, |
|
|
640 | 641 | scrollSensitivity: 20, |
|
|
641 | 642 | scrollSpeed: 15, |
|
|
642 | 643 | format: this.SERIALIZE_RULE, |
|
|
643 | - | |
|
|
644 |
- // these take arrays of elements or ids and can be |
|
|
|
644 | + | |
|
|
645 | + // these take arrays of elements or ids and can be | |
|
|
645 | 646 | // used for better initialization performance |
|
|
646 | 647 | elements: false, |
|
|
647 | 648 | handles: false, |
|
|
648 | - | |
|
|
649 | + | |
|
|
649 | 650 | onChange: Prototype.emptyFunction, |
|
|
650 | 651 | onUpdate: Prototype.emptyFunction |
|
|
651 | 652 | }, arguments[1] || { }); |
| @@ -682,24 +683,24 | |||
|
|
682 | 683 | if(options.zindex) |
|
|
683 | 684 | options_for_draggable.zindex = options.zindex; |
|
|
684 | 685 | |
|
|
685 |
- // build options for the droppables |
|
|
|
686 | + // build options for the droppables | |
|
|
686 | 687 | var options_for_droppable = { |
|
|
687 | 688 | overlap: options.overlap, |
|
|
688 | 689 | containment: options.containment, |
|
|
689 | 690 | tree: options.tree, |
|
|
690 | 691 | hoverclass: options.hoverclass, |
|
|
691 | 692 | onHover: Sortable.onHover |
|
|
692 | - } | |
|
|
693 | - | |
|
|
693 | + }; | |
|
|
694 | + | |
|
|
694 | 695 | var options_for_tree = { |
|
|
695 | 696 | onHover: Sortable.onEmptyHover, |
|
|
696 | 697 | overlap: options.overlap, |
|
|
697 | 698 | containment: options.containment, |
|
|
698 | 699 | hoverclass: options.hoverclass |
|
|
699 | - } | |
|
|
700 | + }; | |
|
|
700 | 701 | |
|
|
701 | 702 | // fix for gecko engine |
|
|
702 |
- |
|
|
|
703 | + Element.cleanWhitespace(element); | |
|
|
703 | 704 | |
|
|
704 | 705 | options.draggables = []; |
|
|
705 | 706 | options.droppables = []; |
| @@ -712,14 +713,14 | |||
|
|
712 | 713 | |
|
|
713 | 714 | (options.elements || this.findElements(element, options) || []).each( function(e,i) { |
|
|
714 | 715 | var handle = options.handles ? $(options.handles[i]) : |
|
|
715 |
- (options.handle ? $(e).select('.' + options.handle)[0] : e); |
|
|
|
716 | + (options.handle ? $(e).select('.' + options.handle)[0] : e); | |
|
|
716 | 717 | options.draggables.push( |
|
|
717 | 718 | new Draggable(e, Object.extend(options_for_draggable, { handle: handle }))); |
|
|
718 | 719 | Droppables.add(e, options_for_droppable); |
|
|
719 | 720 | if(options.tree) e.treeNode = element; |
|
|
720 |
- options.droppables.push(e); |
|
|
|
721 | + options.droppables.push(e); | |
|
|
721 | 722 | }); |
|
|
722 | - | |
|
|
723 | + | |
|
|
723 | 724 | if(options.tree) { |
|
|
724 | 725 | (Sortable.findTreeElements(element, options) || []).each( function(e) { |
|
|
725 | 726 | Droppables.add(e, options_for_tree); |
| @@ -741,7 +742,7 | |||
|
|
741 | 742 | return Element.findChildren( |
|
|
742 | 743 | element, options.only, options.tree ? true : false, options.tag); |
|
|
743 | 744 | }, |
|
|
744 | - | |
|
|
745 | + | |
|
|
745 | 746 | findTreeElements: function(element, options) { |
|
|
746 | 747 | return Element.findChildren( |
|
|
747 | 748 | element, options.only, options.tree ? true : false, options.treeTag); |
| @@ -758,7 +759,7 | |||
|
|
758 | 759 | var oldParentNode = element.parentNode; |
|
|
759 | 760 | element.style.visibility = "hidden"; // fix gecko rendering |
|
|
760 | 761 | dropon.parentNode.insertBefore(element, dropon); |
|
|
761 |
- if(dropon.parentNode!=oldParentNode) |
|
|
|
762 | + if(dropon.parentNode!=oldParentNode) | |
|
|
762 | 763 | Sortable.options(oldParentNode).onChange(element); |
|
|
763 | 764 | Sortable.options(dropon.parentNode).onChange(element); |
|
|
764 | 765 | } |
| @@ -769,26 +770,26 | |||
|
|
769 | 770 | var oldParentNode = element.parentNode; |
|
|
770 | 771 | element.style.visibility = "hidden"; // fix gecko rendering |
|
|
771 | 772 | dropon.parentNode.insertBefore(element, nextElement); |
|
|
772 |
- if(dropon.parentNode!=oldParentNode) |
|
|
|
773 | + if(dropon.parentNode!=oldParentNode) | |
|
|
773 | 774 | Sortable.options(oldParentNode).onChange(element); |
|
|
774 | 775 | Sortable.options(dropon.parentNode).onChange(element); |
|
|
775 | 776 | } |
|
|
776 | 777 | } |
|
|
777 | 778 | }, |
|
|
778 | - | |
|
|
779 | + | |
|
|
779 | 780 | onEmptyHover: function(element, dropon, overlap) { |
|
|
780 | 781 | var oldParentNode = element.parentNode; |
|
|
781 | 782 | var droponOptions = Sortable.options(dropon); |
|
|
782 | - | |
|
|
783 | + | |
|
|
783 | 784 | if(!Element.isParent(dropon, element)) { |
|
|
784 | 785 | var index; |
|
|
785 | - | |
|
|
786 | + | |
|
|
786 | 787 | var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only}); |
|
|
787 | 788 | var child = null; |
|
|
788 | - | |
|
|
789 | + | |
|
|
789 | 790 | if(children) { |
|
|
790 | 791 | var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap); |
|
|
791 | - | |
|
|
792 | + | |
|
|
792 | 793 | for (index = 0; index < children.length; index += 1) { |
|
|
793 | 794 | if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) { |
|
|
794 | 795 | offset -= Element.offsetSize (children[index], droponOptions.overlap); |
| @@ -801,9 +802,9 | |||
|
|
801 | 802 | } |
|
|
802 | 803 | } |
|
|
803 | 804 | } |
|
|
804 | - | |
|
|
805 | + | |
|
|
805 | 806 | dropon.insertBefore(element, child); |
|
|
806 | - | |
|
|
807 | + | |
|
|
807 | 808 | Sortable.options(oldParentNode).onChange(element); |
|
|
808 | 809 | droponOptions.onChange(element); |
|
|
809 | 810 | } |
| @@ -816,34 +817,34 | |||
|
|
816 | 817 | mark: function(dropon, position) { |
|
|
817 | 818 | // mark on ghosting only |
|
|
818 | 819 | var sortable = Sortable.options(dropon.parentNode); |
|
|
819 |
- if(sortable && !sortable.ghosting) return; |
|
|
|
820 | + if(sortable && !sortable.ghosting) return; | |
|
|
820 | 821 | |
|
|
821 | 822 | if(!Sortable._marker) { |
|
|
822 |
- Sortable._marker = |
|
|
|
823 | + Sortable._marker = | |
|
|
823 | 824 | ($('dropmarker') || Element.extend(document.createElement('DIV'))). |
|
|
824 | 825 | hide().addClassName('dropmarker').setStyle({position:'absolute'}); |
|
|
825 | 826 | document.getElementsByTagName("body").item(0).appendChild(Sortable._marker); |
|
|
826 |
- } |
|
|
|
827 | + } | |
|
|
827 | 828 | var offsets = Position.cumulativeOffset(dropon); |
|
|
828 | 829 | Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'}); |
|
|
829 | - | |
|
|
830 | + | |
|
|
830 | 831 | if(position=='after') |
|
|
831 |
- if(sortable.overlap == 'horizontal') |
|
|
|
832 | + if(sortable.overlap == 'horizontal') | |
|
|
832 | 833 | Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'}); |
|
|
833 | 834 | else |
|
|
834 | 835 | Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'}); |
|
|
835 | - | |
|
|
836 | + | |
|
|
836 | 837 | Sortable._marker.show(); |
|
|
837 | 838 | }, |
|
|
838 | - | |
|
|
839 | + | |
|
|
839 | 840 | _tree: function(element, options, parent) { |
|
|
840 | 841 | var children = Sortable.findElements(element, options) || []; |
|
|
841 | - | |
|
|
842 | + | |
|
|
842 | 843 | for (var i = 0; i < children.length; ++i) { |
|
|
843 | 844 | var match = children[i].id.match(options.format); |
|
|
844 | 845 | |
|
|
845 | 846 | if (!match) continue; |
|
|
846 | - | |
|
|
847 | + | |
|
|
847 | 848 | var child = { |
|
|
848 | 849 | id: encodeURIComponent(match ? match[1] : null), |
|
|
849 | 850 | element: element, |
| @@ -851,16 +852,16 | |||
|
|
851 | 852 | children: [], |
|
|
852 | 853 | position: parent.children.length, |
|
|
853 | 854 | container: $(children[i]).down(options.treeTag) |
|
|
854 | - } | |
|
|
855 | - | |
|
|
855 | + }; | |
|
|
856 | + | |
|
|
856 | 857 | /* Get the element containing the children and recurse over it */ |
|
|
857 | 858 | if (child.container) |
|
|
858 | - this._tree(child.container, options, child) | |
|
|
859 | - | |
|
|
859 | + this._tree(child.container, options, child); | |
|
|
860 | + | |
|
|
860 | 861 | parent.children.push (child); |
|
|
861 | 862 | } |
|
|
862 | 863 | |
|
|
863 |
- return parent; |
|
|
|
864 | + return parent; | |
|
|
864 | 865 | }, |
|
|
865 | 866 | |
|
|
866 | 867 | tree: function(element) { |
| @@ -873,15 +874,15 | |||
|
|
873 | 874 | name: element.id, |
|
|
874 | 875 | format: sortableOptions.format |
|
|
875 | 876 | }, arguments[1] || { }); |
|
|
876 | - | |
|
|
877 | + | |
|
|
877 | 878 | var root = { |
|
|
878 | 879 | id: null, |
|
|
879 | 880 | parent: null, |
|
|
880 | 881 | children: [], |
|
|
881 | 882 | container: element, |
|
|
882 | 883 | position: 0 |
|
|
883 | - } | |
|
|
884 | - | |
|
|
884 | + }; | |
|
|
885 | + | |
|
|
885 | 886 | return Sortable._tree(element, options, root); |
|
|
886 | 887 | }, |
|
|
887 | 888 | |
| @@ -897,7 +898,7 | |||
|
|
897 | 898 | sequence: function(element) { |
|
|
898 | 899 | element = $(element); |
|
|
899 | 900 | var options = Object.extend(this.options(element), arguments[1] || { }); |
|
|
900 | - | |
|
|
901 | + | |
|
|
901 | 902 | return $(this.findElements(element, options) || []).map( function(item) { |
|
|
902 | 903 | return item.id.match(options.format) ? item.id.match(options.format)[1] : ''; |
|
|
903 | 904 | }); |
| @@ -906,14 +907,14 | |||
|
|
906 | 907 | setSequence: function(element, new_sequence) { |
|
|
907 | 908 | element = $(element); |
|
|
908 | 909 | var options = Object.extend(this.options(element), arguments[2] || { }); |
|
|
909 | - | |
|
|
910 | + | |
|
|
910 | 911 | var nodeMap = { }; |
|
|
911 | 912 | this.findElements(element, options).each( function(n) { |
|
|
912 | 913 | if (n.id.match(options.format)) |
|
|
913 | 914 | nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode]; |
|
|
914 | 915 | n.parentNode.removeChild(n); |
|
|
915 | 916 | }); |
|
|
916 | - | |
|
|
917 | + | |
|
|
917 | 918 | new_sequence.each(function(ident) { |
|
|
918 | 919 | var n = nodeMap[ident]; |
|
|
919 | 920 | if (n) { |
| @@ -922,16 +923,16 | |||
|
|
922 | 923 | } |
|
|
923 | 924 | }); |
|
|
924 | 925 | }, |
|
|
925 | - | |
|
|
926 | + | |
|
|
926 | 927 | serialize: function(element) { |
|
|
927 | 928 | element = $(element); |
|
|
928 | 929 | var options = Object.extend(Sortable.options(element), arguments[1] || { }); |
|
|
929 | 930 | var name = encodeURIComponent( |
|
|
930 | 931 | (arguments[1] && arguments[1].name) ? arguments[1].name : element.id); |
|
|
931 | - | |
|
|
932 | + | |
|
|
932 | 933 | if (options.tree) { |
|
|
933 | 934 | return Sortable.tree(element, arguments[1]).children.map( function (item) { |
|
|
934 |
- return [name + Sortable._constructIndex(item) + "[id]=" + |
|
|
|
935 | + return [name + Sortable._constructIndex(item) + "[id]=" + | |
|
|
935 | 936 | encodeURIComponent(item.id)].concat(item.children.map(arguments.callee)); |
|
|
936 | 937 | }).flatten().join('&'); |
|
|
937 | 938 | } else { |
| @@ -940,16 +941,16 | |||
|
|
940 | 941 | }).join('&'); |
|
|
941 | 942 | } |
|
|
942 | 943 | } |
|
|
943 | - } | |
|
|
944 | + }; | |
|
|
944 | 945 | |
|
|
945 | 946 |
|
|
|
946 | 947 | Element.isParent = function(child, element) { |
|
|
947 | 948 | if (!child.parentNode || child == element) return false; |
|
|
948 | 949 | if (child.parentNode == element) return true; |
|
|
949 | 950 | return Element.isParent(child.parentNode, element); |
|
|
950 | - } | |
|
|
951 | + }; | |
|
|
951 | 952 | |
|
|
952 |
- Element.findChildren = function(element, only, recursive, tagName) { |
|
|
|
953 | + Element.findChildren = function(element, only, recursive, tagName) { | |
|
|
953 | 954 | if(!element.hasChildNodes()) return null; |
|
|
954 | 955 | tagName = tagName.toUpperCase(); |
|
|
955 | 956 | if(only) only = [only].flatten(); |
| @@ -965,8 +966,8 | |||
|
|
965 | 966 | }); |
|
|
966 | 967 | |
|
|
967 | 968 | return (elements.length>0 ? elements.flatten() : []); |
|
|
968 | - } | |
|
|
969 | + }; | |
|
|
969 | 970 | |
|
|
970 | 971 | Element.offsetSize = function (element, type) { |
|
|
971 | 972 | return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')]; |
|
|
972 | - } | |
|
|
973 | + }; No newline at end of file | |
| @@ -3,46 +3,46 | |||
|
|
3 | 3 | // Justin Palmer (http://encytemedia.com/) |
|
|
4 | 4 | // Mark Pilgrim (http://diveintomark.org/) |
|
|
5 | 5 | // Martin Bialasinki |
|
|
6 |
- // |
|
|
|
6 | + // | |
|
|
7 | 7 | // script.aculo.us is freely distributable under the terms of an MIT-style license. |
|
|
8 |
- // For details, see the script.aculo.us web site: http://script.aculo.us/ |
|
|
|
8 | + // For details, see the script.aculo.us web site: http://script.aculo.us/ | |
|
|
9 | 9 | |
|
|
10 |
- // converts rgb() and #xxx to #xxxxxx format, |
|
|
|
11 |
- // returns self (or first argument) if not convertable |
|
|
|
12 |
- String.prototype.parseColor = function() { |
|
|
|
10 | + // converts rgb() and #xxx to #xxxxxx format, | |
|
|
11 | + // returns self (or first argument) if not convertable | |
|
|
12 | + String.prototype.parseColor = function() { | |
|
|
13 | 13 | var color = '#'; |
|
|
14 |
- if (this.slice(0,4) == 'rgb(') { |
|
|
|
15 |
- var cols = this.slice(4,this.length-1).split(','); |
|
|
|
16 |
- var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); |
|
|
|
17 |
- } else { |
|
|
|
18 |
- if (this.slice(0,1) == '#') { |
|
|
|
19 |
- if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); |
|
|
|
20 |
- if (this.length==7) color = this.toLowerCase(); |
|
|
|
21 |
- } |
|
|
|
22 |
- } |
|
|
|
23 |
- return (color.length==7 ? color : (arguments[0] || this)); |
|
|
|
14 | + if (this.slice(0,4) == 'rgb(') { | |
|
|
15 | + var cols = this.slice(4,this.length-1).split(','); | |
|
|
16 | + var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3); | |
|
|
17 | + } else { | |
|
|
18 | + if (this.slice(0,1) == '#') { | |
|
|
19 | + if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase(); | |
|
|
20 | + if (this.length==7) color = this.toLowerCase(); | |
|
|
21 | + } | |
|
|
22 | + } | |
|
|
23 | + return (color.length==7 ? color : (arguments[0] || this)); | |
|
|
24 | 24 | }; |
|
|
25 | 25 | |
|
|
26 | 26 | /*--------------------------------------------------------------------------*/ |
|
|
27 | 27 | |
|
|
28 |
- Element.collectTextNodes = function(element) { |
|
|
|
28 | + Element.collectTextNodes = function(element) { | |
|
|
29 | 29 | return $A($(element).childNodes).collect( function(node) { |
|
|
30 |
- return (node.nodeType==3 ? node.nodeValue : |
|
|
|
30 | + return (node.nodeType==3 ? node.nodeValue : | |
|
|
31 | 31 | (node.hasChildNodes() ? Element.collectTextNodes(node) : '')); |
|
|
32 | 32 | }).flatten().join(''); |
|
|
33 | 33 | }; |
|
|
34 | 34 | |
|
|
35 |
- Element.collectTextNodesIgnoreClass = function(element, className) { |
|
|
|
35 | + Element.collectTextNodesIgnoreClass = function(element, className) { | |
|
|
36 | 36 | return $A($(element).childNodes).collect( function(node) { |
|
|
37 |
- return (node.nodeType==3 ? node.nodeValue : |
|
|
|
38 |
- ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? |
|
|
|
37 | + return (node.nodeType==3 ? node.nodeValue : | |
|
|
38 | + ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? | |
|
|
39 | 39 | Element.collectTextNodesIgnoreClass(node, className) : '')); |
|
|
40 | 40 | }).flatten().join(''); |
|
|
41 | 41 | }; |
|
|
42 | 42 | |
|
|
43 | 43 | Element.setContentZoom = function(element, percent) { |
|
|
44 |
- element = $(element); |
|
|
|
45 |
- element.setStyle({fontSize: (percent/100) + 'em'}); |
|
|
|
44 | + element = $(element); | |
|
|
45 | + element.setStyle({fontSize: (percent/100) + 'em'}); | |
|
|
46 | 46 | if (Prototype.Browser.WebKit) window.scrollBy(0,0); |
|
|
47 | 47 | return element; |
|
|
48 | 48 | }; |
| @@ -70,28 +70,23 | |||
|
|
70 | 70 | Transitions: { |
|
|
71 | 71 | linear: Prototype.K, |
|
|
72 | 72 | sinoidal: function(pos) { |
|
|
73 |
- return (-Math.cos(pos*Math.PI)/2) + |
|
|
|
73 | + return (-Math.cos(pos*Math.PI)/2) + .5; | |
|
|
74 | 74 | }, |
|
|
75 | 75 | reverse: function(pos) { |
|
|
76 | 76 | return 1-pos; |
|
|
77 | 77 | }, |
|
|
78 | 78 | flicker: function(pos) { |
|
|
79 |
- var pos = ((-Math.cos(pos*Math.PI)/4) + |
|
|
|
79 | + var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4; | |
|
|
80 | 80 | return pos > 1 ? 1 : pos; |
|
|
81 | 81 | }, |
|
|
82 | 82 | wobble: function(pos) { |
|
|
83 |
- return (-Math.cos(pos*Math.PI*(9*pos))/2) + |
|
|
|
83 | + return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5; | |
|
|
84 | 84 | }, |
|
|
85 |
- pulse: function(pos, pulses) { |
|
|
|
86 | - pulses = pulses || 5; | |
|
|
87 | - return ( | |
|
|
88 | - ((pos % (1/pulses)) * pulses).round() == 0 ? | |
|
|
89 | - ((pos * pulses * 2) - (pos * pulses * 2).floor()) : | |
|
|
90 | - 1 - ((pos * pulses * 2) - (pos * pulses * 2).floor()) | |
|
|
91 | - ); | |
|
|
85 | + pulse: function(pos, pulses) { | |
|
|
86 | + return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5; | |
|
|
92 | 87 | }, |
|
|
93 |
- spring: function(pos) { |
|
|
|
94 |
- return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); |
|
|
|
88 | + spring: function(pos) { | |
|
|
89 | + return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); | |
|
|
95 | 90 | }, |
|
|
96 | 91 | none: function(pos) { |
|
|
97 | 92 | return 0; |
| @@ -112,14 +107,14 | |||
|
|
112 | 107 | tagifyText: function(element) { |
|
|
113 | 108 | var tagifyStyle = 'position:relative'; |
|
|
114 | 109 | if (Prototype.Browser.IE) tagifyStyle += ';zoom:1'; |
|
|
115 | - | |
|
|
110 | + | |
|
|
116 | 111 | element = $(element); |
|
|
117 | 112 | $A(element.childNodes).each( function(child) { |
|
|
118 | 113 | if (child.nodeType==3) { |
|
|
119 | 114 | child.nodeValue.toArray().each( function(character) { |
|
|
120 | 115 | element.insertBefore( |
|
|
121 | 116 | new Element('span', {style: tagifyStyle}).update( |
|
|
122 |
- character == ' ' ? String.fromCharCode(160) : character), |
|
|
|
117 | + character == ' ' ? String.fromCharCode(160) : character), | |
|
|
123 | 118 | child); |
|
|
124 | 119 | }); |
|
|
125 | 120 | Element.remove(child); |
| @@ -128,13 +123,13 | |||
|
|
128 | 123 | }, |
|
|
129 | 124 | multiple: function(element, effect) { |
|
|
130 | 125 | var elements; |
|
|
131 |
- if (((typeof element == 'object') || |
|
|
|
132 |
- Object.isFunction(element)) && |
|
|
|
126 | + if (((typeof element == 'object') || | |
|
|
127 | + Object.isFunction(element)) && | |
|
|
133 | 128 | (element.length)) |
|
|
134 | 129 | elements = element; |
|
|
135 | 130 | else |
|
|
136 | 131 | elements = $(element).childNodes; |
|
|
137 | - | |
|
|
132 | + | |
|
|
138 | 133 | var options = Object.extend({ |
|
|
139 | 134 | speed: 0.1, |
|
|
140 | 135 | delay: 0.0 |
| @@ -156,7 +151,7 | |||
|
|
156 | 151 | var options = Object.extend({ |
|
|
157 | 152 | queue: { position:'end', scope:(element.id || 'global'), limit: 1 } |
|
|
158 | 153 | }, arguments[2] || { }); |
|
|
159 |
- Effect[element.visible() ? |
|
|
|
154 | + Effect[element.visible() ? | |
|
|
160 | 155 | Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options); |
|
|
161 | 156 | } |
|
|
162 | 157 | }; |
| @@ -168,20 +163,20 | |||
|
|
168 | 163 | Effect.ScopedQueue = Class.create(Enumerable, { |
|
|
169 | 164 | initialize: function() { |
|
|
170 | 165 | this.effects = []; |
|
|
171 |
- this.interval = null; |
|
|
|
166 | + this.interval = null; | |
|
|
172 | 167 | }, |
|
|
173 | 168 | _each: function(iterator) { |
|
|
174 | 169 | this.effects._each(iterator); |
|
|
175 | 170 | }, |
|
|
176 | 171 | add: function(effect) { |
|
|
177 | 172 | var timestamp = new Date().getTime(); |
|
|
178 | - | |
|
|
179 |
- var position = Object.isString(effect.options.queue) ? |
|
|
|
173 | + | |
|
|
174 | + var position = Object.isString(effect.options.queue) ? | |
|
|
180 | 175 | effect.options.queue : effect.options.queue.position; |
|
|
181 | - | |
|
|
176 | + | |
|
|
182 | 177 | switch(position) { |
|
|
183 | 178 | case 'front': |
|
|
184 |
- // move unstarted effects after this effect |
|
|
|
179 | + // move unstarted effects after this effect | |
|
|
185 | 180 | this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) { |
|
|
186 | 181 | e.startOn += effect.finishOn; |
|
|
187 | 182 | e.finishOn += effect.finishOn; |
| @@ -195,13 +190,13 | |||
|
|
195 | 190 | timestamp = this.effects.pluck('finishOn').max() || timestamp; |
|
|
196 | 191 | break; |
|
|
197 | 192 | } |
|
|
198 | - | |
|
|
193 | + | |
|
|
199 | 194 | effect.startOn += timestamp; |
|
|
200 | 195 | effect.finishOn += timestamp; |
|
|
201 | 196 | |
|
|
202 | 197 | if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit)) |
|
|
203 | 198 | this.effects.push(effect); |
|
|
204 | - | |
|
|
199 | + | |
|
|
205 | 200 | if (!this.interval) |
|
|
206 | 201 | this.interval = setInterval(this.loop.bind(this), 15); |
|
|
207 | 202 | }, |
| @@ -214,7 +209,7 | |||
|
|
214 | 209 | }, |
|
|
215 | 210 | loop: function() { |
|
|
216 | 211 | var timePos = new Date().getTime(); |
|
|
217 |
- for(var i=0, len=this.effects.length;i<len;i++) |
|
|
|
212 | + for(var i=0, len=this.effects.length;i<len;i++) | |
|
|
218 | 213 | this.effects[i] && this.effects[i].loop(timePos); |
|
|
219 | 214 | } |
|
|
220 | 215 | }); |
| @@ -223,7 +218,7 | |||
|
|
223 | 218 | instances: $H(), |
|
|
224 | 219 | get: function(queueName) { |
|
|
225 | 220 | if (!Object.isString(queueName)) return queueName; |
|
|
226 | - | |
|
|
221 | + | |
|
|
227 | 222 | return this.instances.get(queueName) || |
|
|
228 | 223 | this.instances.set(queueName, new Effect.ScopedQueue()); |
|
|
229 | 224 | } |
| @@ -248,23 +243,35 | |||
|
|
248 | 243 | this.fromToDelta = this.options.to-this.options.from; |
|
|
249 | 244 | this.totalTime = this.finishOn-this.startOn; |
|
|
250 | 245 | this.totalFrames = this.options.fps*this.options.duration; |
|
|
251 | - | |
|
|
252 |
- |
|
|
|
253 | - 'if (this.state=="idle"){this.state="running";'+ | |
|
|
254 | - codeForEvent(this.options,'beforeSetup')+ | |
|
|
255 | - (this.setup ? 'this.setup();':'')+ | |
|
|
256 | - codeForEvent(this.options,'afterSetup')+ | |
|
|
257 | - '};if (this.state=="running"){'+ | |
|
|
258 | - 'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+ | |
|
|
259 | - 'this.position=pos;'+ | |
|
|
260 | - codeForEvent(this.options,'beforeUpdate')+ | |
|
|
261 | - (this.update ? 'this.update(pos);':'')+ | |
|
|
262 | - codeForEvent(this.options,'afterUpdate')+ | |
|
|
263 | - '}}'); | |
|
|
264 | - | |
|
|
246 | + | |
|
|
247 | + this.render = (function() { | |
|
|
248 | + function dispatch(effect, eventName) { | |
|
|
249 | + if (effect.options[eventName + 'Internal']) | |
|
|
250 | + effect.options[eventName + 'Internal'](effect); | |
|
|
251 | + if (effect.options[eventName]) | |
|
|
252 | + effect.options[eventName](effect); | |
|
|
253 | + } | |
|
|
254 | + | |
|
|
255 | + return function(pos) { | |
|
|
256 | + if (this.state === "idle") { | |
|
|
257 | + this.state = "running"; | |
|
|
258 | + dispatch(this, 'beforeSetup'); | |
|
|
259 | + if (this.setup) this.setup(); | |
|
|
260 | + dispatch(this, 'afterSetup'); | |
|
|
261 | + } | |
|
|
262 | + if (this.state === "running") { | |
|
|
263 | + pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from; | |
|
|
264 | + this.position = pos; | |
|
|
265 | + dispatch(this, 'beforeUpdate'); | |
|
|
266 | + if (this.update) this.update(pos); | |
|
|
267 | + dispatch(this, 'afterUpdate'); | |
|
|
268 | + } | |
|
|
269 | + }; | |
|
|
270 | + })(); | |
|
|
271 | + | |
|
|
265 | 272 | this.event('beforeStart'); |
|
|
266 | 273 | if (!this.options.sync) |
|
|
267 |
- Effect.Queues.get(Object.isString(this.options.queue) ? |
|
|
|
274 | + Effect.Queues.get(Object.isString(this.options.queue) ? | |
|
|
268 | 275 | 'global' : this.options.queue.scope).add(this); |
|
|
269 | 276 | }, |
|
|
270 | 277 | loop: function(timePos) { |
| @@ -273,9 +280,9 | |||
|
|
273 | 280 | this.render(1.0); |
|
|
274 | 281 | this.cancel(); |
|
|
275 | 282 | this.event('beforeFinish'); |
|
|
276 |
- if (this.finish) this.finish(); |
|
|
|
283 | + if (this.finish) this.finish(); | |
|
|
277 | 284 | this.event('afterFinish'); |
|
|
278 |
- return; |
|
|
|
285 | + return; | |
|
|
279 | 286 | } |
|
|
280 | 287 | var pos = (timePos - this.startOn) / this.totalTime, |
|
|
281 | 288 | frame = (pos * this.totalFrames).round(); |
| @@ -287,7 +294,7 | |||
|
|
287 | 294 | }, |
|
|
288 | 295 | cancel: function() { |
|
|
289 | 296 | if (!this.options.sync) |
|
|
290 |
- Effect.Queues.get(Object.isString(this.options.queue) ? |
|
|
|
297 | + Effect.Queues.get(Object.isString(this.options.queue) ? | |
|
|
291 | 298 | 'global' : this.options.queue.scope).remove(this); |
|
|
292 | 299 | this.state = 'finished'; |
|
|
293 | 300 | }, |
| @@ -325,10 +332,10 | |||
|
|
325 | 332 | Effect.Tween = Class.create(Effect.Base, { |
|
|
326 | 333 | initialize: function(object, from, to) { |
|
|
327 | 334 | object = Object.isString(object) ? $(object) : object; |
|
|
328 |
- var args = $A(arguments), method = args.last(), |
|
|
|
335 | + var args = $A(arguments), method = args.last(), | |
|
|
329 | 336 | options = args.length == 5 ? args[3] : null; |
|
|
330 | 337 | this.method = Object.isFunction(method) ? method.bind(object) : |
|
|
331 |
- Object.isFunction(object[method]) ? object[method].bind(object) : |
|
|
|
338 | + Object.isFunction(object[method]) ? object[method].bind(object) : | |
|
|
332 | 339 | function(value) { object[method] = value }; |
|
|
333 | 340 | this.start(Object.extend({ from: from, to: to }, options || { })); |
|
|
334 | 341 | }, |
| @@ -392,7 +399,7 | |||
|
|
392 | 399 | |
|
|
393 | 400 | // for backwards compatibility |
|
|
394 | 401 | Effect.MoveBy = function(element, toTop, toLeft) { |
|
|
395 |
- return new Effect.Move(element, |
|
|
|
402 | + return new Effect.Move(element, | |
|
|
396 | 403 | Object.extend({ x: toLeft, y: toTop }, arguments[3] || { })); |
|
|
397 | 404 | }; |
|
|
398 | 405 | |
| @@ -414,15 +421,15 | |||
|
|
414 | 421 | setup: function() { |
|
|
415 | 422 | this.restoreAfterFinish = this.options.restoreAfterFinish || false; |
|
|
416 | 423 | this.elementPositioning = this.element.getStyle('position'); |
|
|
417 | - | |
|
|
424 | + | |
|
|
418 | 425 | this.originalStyle = { }; |
|
|
419 | 426 | ['top','left','width','height','fontSize'].each( function(k) { |
|
|
420 | 427 | this.originalStyle[k] = this.element.style[k]; |
|
|
421 | 428 | }.bind(this)); |
|
|
422 | - | |
|
|
429 | + | |
|
|
423 | 430 | this.originalTop = this.element.offsetTop; |
|
|
424 | 431 | this.originalLeft = this.element.offsetLeft; |
|
|
425 | - | |
|
|
432 | + | |
|
|
426 | 433 | var fontSize = this.element.getStyle('font-size') || '100%'; |
|
|
427 | 434 | ['em','px','%','pt'].each( function(fontSizeType) { |
|
|
428 | 435 | if (fontSize.indexOf(fontSizeType)>0) { |
| @@ -430,9 +437,9 | |||
|
|
430 | 437 | this.fontSizeType = fontSizeType; |
|
|
431 | 438 | } |
|
|
432 | 439 | }.bind(this)); |
|
|
433 | - | |
|
|
440 | + | |
|
|
434 | 441 | this.factor = (this.options.scaleTo - this.options.scaleFrom)/100; |
|
|
435 | - | |
|
|
442 | + | |
|
|
436 | 443 | this.dims = null; |
|
|
437 | 444 | if (this.options.scaleMode=='box') |
|
|
438 | 445 | this.dims = [this.element.offsetHeight, this.element.offsetWidth]; |
| @@ -507,17 +514,16 | |||
|
|
507 | 514 | |
|
|
508 | 515 | Effect.ScrollTo = function(element) { |
|
|
509 | 516 | var options = arguments[1] || { }, |
|
|
510 |
- |
|
|
|
511 |
- |
|
|
|
512 | - max = (window.height || document.body.scrollHeight) - document.viewport.getHeight(); | |
|
|
517 | + scrollOffsets = document.viewport.getScrollOffsets(), | |
|
|
518 | + elementOffsets = $(element).cumulativeOffset(); | |
|
|
513 | 519 | |
|
|
514 | 520 | if (options.offset) elementOffsets[1] += options.offset; |
|
|
515 | 521 | |
|
|
516 | 522 | return new Effect.Tween(null, |
|
|
517 | 523 | scrollOffsets.top, |
|
|
518 | - elementOffsets[1] > max ? max : elementOffsets[1], | |
|
|
524 | + elementOffsets[1], | |
|
|
519 | 525 | options, |
|
|
520 | - function(p){ scrollTo(scrollOffsets.left, p.round()) } | |
|
|
526 | + function(p){ scrollTo(scrollOffsets.left, p.round()); } | |
|
|
521 | 527 | ); |
|
|
522 | 528 | }; |
|
|
523 | 529 | |
| @@ -529,9 +535,9 | |||
|
|
529 | 535 | var options = Object.extend({ |
|
|
530 | 536 | from: element.getOpacity() || 1.0, |
|
|
531 | 537 | to: 0.0, |
|
|
532 |
- afterFinishInternal: function(effect) { |
|
|
|
538 | + afterFinishInternal: function(effect) { | |
|
|
533 | 539 | if (effect.options.to!=0) return; |
|
|
534 |
- effect.element.hide().setStyle({opacity: oldOpacity}); |
|
|
|
540 | + effect.element.hide().setStyle({opacity: oldOpacity}); | |
|
|
535 | 541 | } |
|
|
536 | 542 | }, arguments[1] || { }); |
|
|
537 | 543 | return new Effect.Opacity(element,options); |
| @@ -547,15 +553,15 | |||
|
|
547 | 553 | effect.element.forceRerendering(); |
|
|
548 | 554 | }, |
|
|
549 | 555 | beforeSetup: function(effect) { |
|
|
550 |
- effect.element.setOpacity(effect.options.from).show(); |
|
|
|
556 | + effect.element.setOpacity(effect.options.from).show(); | |
|
|
551 | 557 | }}, arguments[1] || { }); |
|
|
552 | 558 | return new Effect.Opacity(element,options); |
|
|
553 | 559 | }; |
|
|
554 | 560 | |
|
|
555 | 561 | Effect.Puff = function(element) { |
|
|
556 | 562 | element = $(element); |
|
|
557 |
- var oldStyle = { |
|
|
|
558 |
- opacity: element.getInlineOpacity(), |
|
|
|
563 | + var oldStyle = { | |
|
|
564 | + opacity: element.getInlineOpacity(), | |
|
|
559 | 565 | position: element.getStyle('position'), |
|
|
560 | 566 | top: element.style.top, |
|
|
561 | 567 | left: element.style.left, |
| @@ -563,12 +569,12 | |||
|
|
563 | 569 | height: element.style.height |
|
|
564 | 570 | }; |
|
|
565 | 571 | return new Effect.Parallel( |
|
|
566 |
- [ new Effect.Scale(element, 200, |
|
|
|
567 |
- { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), |
|
|
|
568 |
- new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], |
|
|
|
569 |
- Object.extend({ duration: 1.0, |
|
|
|
572 | + [ new Effect.Scale(element, 200, | |
|
|
573 | + { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), | |
|
|
574 | + new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], | |
|
|
575 | + Object.extend({ duration: 1.0, | |
|
|
570 | 576 | beforeSetupInternal: function(effect) { |
|
|
571 | - Position.absolutize(effect.effects[0].element) | |
|
|
577 | + Position.absolutize(effect.effects[0].element); | |
|
|
572 | 578 | }, |
|
|
573 | 579 | afterFinishInternal: function(effect) { |
|
|
574 | 580 | effect.effects[0].element.hide().setStyle(oldStyle); } |
| @@ -580,12 +586,12 | |||
|
|
580 | 586 | element = $(element); |
|
|
581 | 587 | element.makeClipping(); |
|
|
582 | 588 | return new Effect.Scale(element, 0, |
|
|
583 |
- Object.extend({ scaleContent: false, |
|
|
|
584 |
- scaleX: false, |
|
|
|
589 | + Object.extend({ scaleContent: false, | |
|
|
590 | + scaleX: false, | |
|
|
585 | 591 | restoreAfterFinish: true, |
|
|
586 | 592 | afterFinishInternal: function(effect) { |
|
|
587 | 593 | effect.element.hide().undoClipping(); |
|
|
588 |
- } |
|
|
|
594 | + } | |
|
|
589 | 595 | }, arguments[1] || { }) |
|
|
590 | 596 | ); |
|
|
591 | 597 | }; |
| @@ -593,15 +599,15 | |||
|
|
593 | 599 | Effect.BlindDown = function(element) { |
|
|
594 | 600 | element = $(element); |
|
|
595 | 601 | var elementDimensions = element.getDimensions(); |
|
|
596 |
- return new Effect.Scale(element, 100, Object.extend({ |
|
|
|
597 |
- scaleContent: false, |
|
|
|
602 | + return new Effect.Scale(element, 100, Object.extend({ | |
|
|
603 | + scaleContent: false, | |
|
|
598 | 604 | scaleX: false, |
|
|
599 | 605 | scaleFrom: 0, |
|
|
600 | 606 | scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, |
|
|
601 | 607 | restoreAfterFinish: true, |
|
|
602 | 608 | afterSetup: function(effect) { |
|
|
603 |
- effect.element.makeClipping().setStyle({height: '0px'}).show(); |
|
|
|
604 |
- }, |
|
|
|
609 | + effect.element.makeClipping().setStyle({height: '0px'}).show(); | |
|
|
610 | + }, | |
|
|
605 | 611 | afterFinishInternal: function(effect) { |
|
|
606 | 612 | effect.element.undoClipping(); |
|
|
607 | 613 | } |
| @@ -616,16 +622,16 | |||
|
|
616 | 622 | from: 0, |
|
|
617 | 623 | transition: Effect.Transitions.flicker, |
|
|
618 | 624 | afterFinishInternal: function(effect) { |
|
|
619 |
- new Effect.Scale(effect.element, 1, { |
|
|
|
625 | + new Effect.Scale(effect.element, 1, { | |
|
|
620 | 626 | duration: 0.3, scaleFromCenter: true, |
|
|
621 | 627 | scaleX: false, scaleContent: false, restoreAfterFinish: true, |
|
|
622 |
- beforeSetup: function(effect) { |
|
|
|
628 | + beforeSetup: function(effect) { | |
|
|
623 | 629 | effect.element.makePositioned().makeClipping(); |
|
|
624 | 630 | }, |
|
|
625 | 631 | afterFinishInternal: function(effect) { |
|
|
626 | 632 | effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity}); |
|
|
627 | 633 | } |
|
|
628 | - }) | |
|
|
634 | + }); | |
|
|
629 | 635 | } |
|
|
630 | 636 | }, arguments[1] || { })); |
|
|
631 | 637 | }; |
| @@ -637,16 +643,16 | |||
|
|
637 | 643 | left: element.getStyle('left'), |
|
|
638 | 644 | opacity: element.getInlineOpacity() }; |
|
|
639 | 645 | return new Effect.Parallel( |
|
|
640 |
- [ new Effect.Move(element, {x: 0, y: 100, sync: true }), |
|
|
|
646 | + [ new Effect.Move(element, {x: 0, y: 100, sync: true }), | |
|
|
641 | 647 | new Effect.Opacity(element, { sync: true, to: 0.0 }) ], |
|
|
642 | 648 | Object.extend( |
|
|
643 | 649 | { duration: 0.5, |
|
|
644 | 650 | beforeSetup: function(effect) { |
|
|
645 |
- effect.effects[0].element.makePositioned(); |
|
|
|
651 | + effect.effects[0].element.makePositioned(); | |
|
|
646 | 652 | }, |
|
|
647 | 653 | afterFinishInternal: function(effect) { |
|
|
648 | 654 | effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle); |
|
|
649 |
- } |
|
|
|
655 | + } | |
|
|
650 | 656 | }, arguments[1] || { })); |
|
|
651 | 657 | }; |
|
|
652 | 658 | |
| @@ -674,7 +680,7 | |||
|
|
674 | 680 | new Effect.Move(effect.element, |
|
|
675 | 681 | { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) { |
|
|
676 | 682 | effect.element.undoPositioned().setStyle(oldStyle); |
|
|
677 | - }}) }}) }}) }}) }}) }}); | |
|
|
683 | + }}); }}); }}); }}); }}); }}); | |
|
|
678 | 684 | }; |
|
|
679 | 685 | |
|
|
680 | 686 | Effect.SlideDown = function(element) { |
| @@ -682,9 +688,9 | |||
|
|
682 | 688 | // SlideDown need to have the content of the element wrapped in a container element with fixed height! |
|
|
683 | 689 | var oldInnerBottom = element.down().getStyle('bottom'); |
|
|
684 | 690 | var elementDimensions = element.getDimensions(); |
|
|
685 |
- return new Effect.Scale(element, 100, Object.extend({ |
|
|
|
686 |
- scaleContent: false, |
|
|
|
687 |
- scaleX: false, |
|
|
|
691 | + return new Effect.Scale(element, 100, Object.extend({ | |
|
|
692 | + scaleContent: false, | |
|
|
693 | + scaleX: false, | |
|
|
688 | 694 | scaleFrom: window.opera ? 0 : 1, |
|
|
689 | 695 | scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, |
|
|
690 | 696 | restoreAfterFinish: true, |
| @@ -692,11 +698,11 | |||
|
|
692 | 698 | effect.element.makePositioned(); |
|
|
693 | 699 | effect.element.down().makePositioned(); |
|
|
694 | 700 | if (window.opera) effect.element.setStyle({top: ''}); |
|
|
695 |
- effect.element.makeClipping().setStyle({height: '0px'}).show(); |
|
|
|
701 | + effect.element.makeClipping().setStyle({height: '0px'}).show(); | |
|
|
696 | 702 | }, |
|
|
697 | 703 | afterUpdateInternal: function(effect) { |
|
|
698 | 704 | effect.element.down().setStyle({bottom: |
|
|
699 |
- (effect.dims[0] - effect.element.clientHeight) + 'px' }); |
|
|
|
705 | + (effect.dims[0] - effect.element.clientHeight) + 'px' }); | |
|
|
700 | 706 | }, |
|
|
701 | 707 | afterFinishInternal: function(effect) { |
|
|
702 | 708 | effect.element.undoClipping().undoPositioned(); |
| @@ -710,8 +716,8 | |||
|
|
710 | 716 | var oldInnerBottom = element.down().getStyle('bottom'); |
|
|
711 | 717 | var elementDimensions = element.getDimensions(); |
|
|
712 | 718 | return new Effect.Scale(element, window.opera ? 0 : 1, |
|
|
713 |
- Object.extend({ scaleContent: false, |
|
|
|
714 |
- scaleX: false, |
|
|
|
719 | + Object.extend({ scaleContent: false, | |
|
|
720 | + scaleX: false, | |
|
|
715 | 721 | scaleMode: 'box', |
|
|
716 | 722 | scaleFrom: 100, |
|
|
717 | 723 | scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, |
| @@ -721,7 +727,7 | |||
|
|
721 | 727 | effect.element.down().makePositioned(); |
|
|
722 | 728 | if (window.opera) effect.element.setStyle({top: ''}); |
|
|
723 | 729 | effect.element.makeClipping().show(); |
|
|
724 |
- }, |
|
|
|
730 | + }, | |
|
|
725 | 731 | afterUpdateInternal: function(effect) { |
|
|
726 | 732 | effect.element.down().setStyle({bottom: |
|
|
727 | 733 | (effect.dims[0] - effect.element.clientHeight) + 'px' }); |
| @@ -734,15 +740,15 | |||
|
|
734 | 740 | ); |
|
|
735 | 741 | }; |
|
|
736 | 742 | |
|
|
737 |
- // Bug in opera makes the TD containing this element expand for a instance after finish |
|
|
|
743 | + // Bug in opera makes the TD containing this element expand for a instance after finish | |
|
|
738 | 744 | Effect.Squish = function(element) { |
|
|
739 |
- return new Effect.Scale(element, window.opera ? 1 : 0, { |
|
|
|
745 | + return new Effect.Scale(element, window.opera ? 1 : 0, { | |
|
|
740 | 746 | restoreAfterFinish: true, |
|
|
741 | 747 | beforeSetup: function(effect) { |
|
|
742 |
- effect.element.makeClipping(); |
|
|
|
743 |
- }, |
|
|
|
748 | + effect.element.makeClipping(); | |
|
|
749 | + }, | |
|
|
744 | 750 | afterFinishInternal: function(effect) { |
|
|
745 |
- effect.element.hide().undoClipping(); |
|
|
|
751 | + effect.element.hide().undoClipping(); | |
|
|
746 | 752 | } |
|
|
747 | 753 | }); |
|
|
748 | 754 | }; |
| @@ -762,13 +768,13 | |||
|
|
762 | 768 | width: element.style.width, |
|
|
763 | 769 | opacity: element.getInlineOpacity() }; |
|
|
764 | 770 | |
|
|
765 |
- var dims = element.getDimensions(); |
|
|
|
771 | + var dims = element.getDimensions(); | |
|
|
766 | 772 | var initialMoveX, initialMoveY; |
|
|
767 | 773 | var moveX, moveY; |
|
|
768 | - | |
|
|
774 | + | |
|
|
769 | 775 | switch (options.direction) { |
|
|
770 | 776 | case 'top-left': |
|
|
771 |
- initialMoveX = initialMoveY = moveX = moveY = 0; |
|
|
|
777 | + initialMoveX = initialMoveY = moveX = moveY = 0; | |
|
|
772 | 778 | break; |
|
|
773 | 779 | case 'top-right': |
|
|
774 | 780 | initialMoveX = dims.width; |
| @@ -793,11 +799,11 | |||
|
|
793 | 799 | moveY = -dims.height / 2; |
|
|
794 | 800 | break; |
|
|
795 | 801 | } |
|
|
796 | - | |
|
|
802 | + | |
|
|
797 | 803 | return new Effect.Move(element, { |
|
|
798 | 804 | x: initialMoveX, |
|
|
799 | 805 | y: initialMoveY, |
|
|
800 |
- duration: 0.01, |
|
|
|
806 | + duration: 0.01, | |
|
|
801 | 807 | beforeSetup: function(effect) { |
|
|
802 | 808 | effect.element.hide().makeClipping().makePositioned(); |
|
|
803 | 809 | }, |
| @@ -806,17 +812,17 | |||
|
|
806 | 812 | [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), |
|
|
807 | 813 | new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), |
|
|
808 | 814 | new Effect.Scale(effect.element, 100, { |
|
|
809 |
- scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, |
|
|
|
815 | + scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, | |
|
|
810 | 816 | sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) |
|
|
811 | 817 | ], Object.extend({ |
|
|
812 | 818 | beforeSetup: function(effect) { |
|
|
813 |
- effect.effects[0].element.setStyle({height: '0px'}).show(); |
|
|
|
819 | + effect.effects[0].element.setStyle({height: '0px'}).show(); | |
|
|
814 | 820 | }, |
|
|
815 | 821 | afterFinishInternal: function(effect) { |
|
|
816 |
- effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); |
|
|
|
822 | + effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); | |
|
|
817 | 823 | } |
|
|
818 | 824 | }, options) |
|
|
819 | - ) | |
|
|
825 | + ); | |
|
|
820 | 826 | } |
|
|
821 | 827 | }); |
|
|
822 | 828 | }; |
| @@ -838,7 +844,7 | |||
|
|
838 | 844 | |
|
|
839 | 845 | var dims = element.getDimensions(); |
|
|
840 | 846 | var moveX, moveY; |
|
|
841 | - | |
|
|
847 | + | |
|
|
842 | 848 | switch (options.direction) { |
|
|
843 | 849 | case 'top-left': |
|
|
844 | 850 | moveX = moveY = 0; |
| @@ -855,19 +861,19 | |||
|
|
855 | 861 | moveX = dims.width; |
|
|
856 | 862 | moveY = dims.height; |
|
|
857 | 863 | break; |
|
|
858 |
- case 'center': |
|
|
|
864 | + case 'center': | |
|
|
859 | 865 | moveX = dims.width / 2; |
|
|
860 | 866 | moveY = dims.height / 2; |
|
|
861 | 867 | break; |
|
|
862 | 868 | } |
|
|
863 | - | |
|
|
869 | + | |
|
|
864 | 870 | return new Effect.Parallel( |
|
|
865 | 871 | [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), |
|
|
866 | 872 | new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), |
|
|
867 | 873 | new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) |
|
|
868 |
- ], Object.extend({ |
|
|
|
874 | + ], Object.extend({ | |
|
|
869 | 875 | beforeStartInternal: function(effect) { |
|
|
870 |
- effect.effects[0].element.makePositioned().makeClipping(); |
|
|
|
876 | + effect.effects[0].element.makePositioned().makeClipping(); | |
|
|
871 | 877 | }, |
|
|
872 | 878 | afterFinishInternal: function(effect) { |
|
|
873 | 879 | effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); } |
| @@ -877,12 +883,14 | |||
|
|
877 | 883 | |
|
|
878 | 884 | Effect.Pulsate = function(element) { |
|
|
879 | 885 | element = $(element); |
|
|
880 |
- var options = arguments[1] || { } |
|
|
|
881 |
- |
|
|
|
882 |
- |
|
|
|
883 | - var reverser = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) }; | |
|
|
884 | - reverser.bind(transition); | |
|
|
885 | - return new Effect.Opacity(element, | |
|
|
886 | + var options = arguments[1] || { }, | |
|
|
887 | + oldOpacity = element.getInlineOpacity(), | |
|
|
888 | + transition = options.transition || Effect.Transitions.linear, | |
|
|
889 | + reverser = function(pos){ | |
|
|
890 | + return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5); | |
|
|
891 | + }; | |
|
|
892 | + | |
|
|
893 | + return new Effect.Opacity(element, | |
|
|
886 | 894 | Object.extend(Object.extend({ duration: 2.0, from: 0, |
|
|
887 | 895 | afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); } |
|
|
888 | 896 | }, options), {transition: reverser})); |
| @@ -896,12 +904,12 | |||
|
|
896 | 904 | width: element.style.width, |
|
|
897 | 905 | height: element.style.height }; |
|
|
898 | 906 | element.makeClipping(); |
|
|
899 |
- return new Effect.Scale(element, 5, Object.extend({ |
|
|
|
907 | + return new Effect.Scale(element, 5, Object.extend({ | |
|
|
900 | 908 | scaleContent: false, |
|
|
901 | 909 | scaleX: false, |
|
|
902 | 910 | afterFinishInternal: function(effect) { |
|
|
903 |
- new Effect.Scale(element, 1, { |
|
|
|
904 |
- scaleContent: false, |
|
|
|
911 | + new Effect.Scale(element, 1, { | |
|
|
912 | + scaleContent: false, | |
|
|
905 | 913 | scaleY: false, |
|
|
906 | 914 | afterFinishInternal: function(effect) { |
|
|
907 | 915 | effect.element.hide().undoClipping().setStyle(oldStyle); |
| @@ -916,7 +924,7 | |||
|
|
916 | 924 | var options = Object.extend({ |
|
|
917 | 925 | style: { } |
|
|
918 | 926 | }, arguments[1] || { }); |
|
|
919 | - | |
|
|
927 | + | |
|
|
920 | 928 | if (!Object.isString(options.style)) this.style = $H(options.style); |
|
|
921 | 929 | else { |
|
|
922 | 930 | if (options.style.include(':')) |
| @@ -934,18 +942,18 | |||
|
|
934 | 942 | effect.transforms.each(function(transform) { |
|
|
935 | 943 | effect.element.style[transform.style] = ''; |
|
|
936 | 944 | }); |
|
|
937 | - } | |
|
|
945 | + }; | |
|
|
938 | 946 | } |
|
|
939 | 947 | } |
|
|
940 | 948 | this.start(options); |
|
|
941 | 949 | }, |
|
|
942 | - | |
|
|
950 | + | |
|
|
943 | 951 | setup: function(){ |
|
|
944 | 952 | function parseColor(color){ |
|
|
945 | 953 | if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff'; |
|
|
946 | 954 | color = color.parseColor(); |
|
|
947 | 955 | return $R(0,2).map(function(i){ |
|
|
948 |
- return parseInt( color.slice(i*2+1,i*2+3), 16 ) |
|
|
|
956 | + return parseInt( color.slice(i*2+1,i*2+3), 16 ); | |
|
|
949 | 957 | }); |
|
|
950 | 958 | } |
|
|
951 | 959 | this.transforms = this.style.map(function(pair){ |
| @@ -965,9 +973,9 | |||
|
|
965 | 973 | } |
|
|
966 | 974 | |
|
|
967 | 975 | var originalValue = this.element.getStyle(property); |
|
|
968 |
- return { |
|
|
|
969 |
- style: property.camelize(), |
|
|
|
970 |
- originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), |
|
|
|
976 | + return { | |
|
|
977 | + style: property.camelize(), | |
|
|
978 | + originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), | |
|
|
971 | 979 | targetValue: unit=='color' ? parseColor(value) : value, |
|
|
972 | 980 | unit: unit |
|
|
973 | 981 | }; |
| @@ -978,13 +986,13 | |||
|
|
978 | 986 | transform.unit != 'color' && |
|
|
979 | 987 | (isNaN(transform.originalValue) || isNaN(transform.targetValue)) |
|
|
980 | 988 | ) |
|
|
981 | - ) | |
|
|
989 | + ); | |
|
|
982 | 990 | }); |
|
|
983 | 991 | }, |
|
|
984 | 992 | update: function(position) { |
|
|
985 | 993 | var style = { }, transform, i = this.transforms.length; |
|
|
986 | 994 | while(i--) |
|
|
987 |
- style[(transform = this.transforms[i]).style] = |
|
|
|
995 | + style[(transform = this.transforms[i]).style] = | |
|
|
988 | 996 | transform.unit=='color' ? '#'+ |
|
|
989 | 997 | (Math.round(transform.originalValue[0]+ |
|
|
990 | 998 | (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() + |
| @@ -993,7 +1001,7 | |||
|
|
993 | 1001 | (Math.round(transform.originalValue[2]+ |
|
|
994 | 1002 | (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() : |
|
|
995 | 1003 | (transform.originalValue + |
|
|
996 |
- (transform.targetValue - transform.originalValue) * position).toFixed(3) + |
|
|
|
1004 | + (transform.targetValue - transform.originalValue) * position).toFixed(3) + | |
|
|
997 | 1005 | (transform.unit === null ? '' : transform.unit); |
|
|
998 | 1006 | this.element.setStyle(style, true); |
|
|
999 | 1007 | } |
| @@ -1030,7 +1038,7 | |||
|
|
1030 | 1038 | }); |
|
|
1031 | 1039 | |
|
|
1032 | 1040 | Element.CSS_PROPERTIES = $w( |
|
|
1033 |
- 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + |
|
|
|
1041 | + 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + | |
|
|
1034 | 1042 | 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' + |
|
|
1035 | 1043 | 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' + |
|
|
1036 | 1044 | 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' + |
| @@ -1039,7 +1047,7 | |||
|
|
1039 | 1047 | 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' + |
|
|
1040 | 1048 | 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' + |
|
|
1041 | 1049 | 'right textIndent top width wordSpacing zIndex'); |
|
|
1042 | - | |
|
|
1050 | + | |
|
|
1043 | 1051 | Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/; |
|
|
1044 | 1052 | |
|
|
1045 | 1053 | String.__parseStyleElement = document.createElement('div'); |
| @@ -1051,11 +1059,11 | |||
|
|
1051 | 1059 | String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>'; |
|
|
1052 | 1060 | style = String.__parseStyleElement.childNodes[0].style; |
|
|
1053 | 1061 | } |
|
|
1054 | - | |
|
|
1062 | + | |
|
|
1055 | 1063 | Element.CSS_PROPERTIES.each(function(property){ |
|
|
1056 |
- if (style[property]) styleRules.set(property, style[property]); |
|
|
|
1064 | + if (style[property]) styleRules.set(property, style[property]); | |
|
|
1057 | 1065 | }); |
|
|
1058 | - | |
|
|
1066 | + | |
|
|
1059 | 1067 | if (Prototype.Browser.IE && this.include('opacity')) |
|
|
1060 | 1068 | styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]); |
|
|
1061 | 1069 | |
| @@ -1074,14 +1082,14 | |||
|
|
1074 | 1082 | Element.getStyles = function(element) { |
|
|
1075 | 1083 | element = $(element); |
|
|
1076 | 1084 | var css = element.currentStyle, styles; |
|
|
1077 |
- styles = Element.CSS_PROPERTIES.inject({ }, function( |
|
|
|
1078 |
- |
|
|
|
1079 |
- return |
|
|
|
1085 | + styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) { | |
|
|
1086 | + results[property] = css[property]; | |
|
|
1087 | + return results; | |
|
|
1080 | 1088 | }); |
|
|
1081 |
- if (!styles.opacity) styles. |
|
|
|
1089 | + if (!styles.opacity) styles.opacity = element.getOpacity(); | |
|
|
1082 | 1090 | return styles; |
|
|
1083 | 1091 | }; |
|
|
1084 |
- } |
|
|
|
1092 | + } | |
|
|
1085 | 1093 | |
|
|
1086 | 1094 | Effect.Methods = { |
|
|
1087 | 1095 | morph: function(element, style) { |
| @@ -1090,7 +1098,7 | |||
|
|
1090 | 1098 | return element; |
|
|
1091 | 1099 | }, |
|
|
1092 | 1100 | visualEffect: function(element, effect, options) { |
|
|
1093 | - element = $(element) | |
|
|
1101 | + element = $(element); | |
|
|
1094 | 1102 | var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1); |
|
|
1095 | 1103 | new Effect[klass](element, options); |
|
|
1096 | 1104 | return element; |
| @@ -1104,17 +1112,17 | |||
|
|
1104 | 1112 | |
|
|
1105 | 1113 | $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+ |
|
|
1106 | 1114 | 'pulsate shake puff squish switchOff dropOut').each( |
|
|
1107 |
- function(effect) { |
|
|
|
1115 | + function(effect) { | |
|
|
1108 | 1116 | Effect.Methods[effect] = function(element, options){ |
|
|
1109 | 1117 | element = $(element); |
|
|
1110 | 1118 | Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options); |
|
|
1111 | 1119 | return element; |
|
|
1112 | - } | |
|
|
1120 | + }; | |
|
|
1113 | 1121 | } |
|
|
1114 | 1122 | ); |
|
|
1115 | 1123 | |
|
|
1116 |
- $w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( |
|
|
|
1124 | + $w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( | |
|
|
1117 | 1125 | function(f) { Effect.Methods[f] = Element[f]; } |
|
|
1118 | 1126 | ); |
|
|
1119 | 1127 | |
|
|
1120 |
- Element.addMethods(Effect.Methods); |
|
|
|
1128 | + Element.addMethods(Effect.Methods); No newline at end of file | |
| This diff has been collapsed as it changes many lines, (637 lines changed) Show them Hide them | |||
| @@ -1,5 +1,5 | |||
|
|
1 |
- /* Prototype JavaScript framework, version 1.6.0. |
|
|
|
2 |
- * (c) 2005-200 |
|
|
|
1 | + /* Prototype JavaScript framework, version 1.6.0.3 | |
|
|
2 | + * (c) 2005-2008 Sam Stephenson | |
|
|
3 | 3 | * |
|
|
4 | 4 | * Prototype is freely distributable under the terms of an MIT-style license. |
|
|
5 | 5 | * For details, see the Prototype web site: http://www.prototypejs.org/ |
| @@ -7,23 +7,26 | |||
|
|
7 | 7 | *--------------------------------------------------------------------------*/ |
|
|
8 | 8 | |
|
|
9 | 9 | var Prototype = { |
|
|
10 |
- Version: '1.6.0. |
|
|
|
10 | + Version: '1.6.0.3', | |
|
|
11 | 11 | |
|
|
12 | 12 | Browser: { |
|
|
13 |
- IE: !!(window.attachEvent && |
|
|
|
14 | - Opera: !!window.opera, | |
|
|
13 | + IE: !!(window.attachEvent && | |
|
|
14 | + navigator.userAgent.indexOf('Opera') === -1), | |
|
|
15 | + Opera: navigator.userAgent.indexOf('Opera') > -1, | |
|
|
15 | 16 | WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1, |
|
|
16 |
- Gecko: navigator.userAgent.indexOf('Gecko') > -1 && |
|
|
|
17 | + Gecko: navigator.userAgent.indexOf('Gecko') > -1 && | |
|
|
18 | + navigator.userAgent.indexOf('KHTML') === -1, | |
|
|
17 | 19 | MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/) |
|
|
18 | 20 | }, |
|
|
19 | 21 | |
|
|
20 | 22 | BrowserFeatures: { |
|
|
21 | 23 | XPath: !!document.evaluate, |
|
|
24 | + SelectorsAPI: !!document.querySelector, | |
|
|
22 | 25 | ElementExtensions: !!window.HTMLElement, |
|
|
23 | 26 | SpecificElementExtensions: |
|
|
24 |
- document.createElement('div') |
|
|
|
25 |
- document.createElement('div') |
|
|
|
26 |
- document.createElement('form') |
|
|
|
27 | + document.createElement('div')['__proto__'] && | |
|
|
28 | + document.createElement('div')['__proto__'] !== | |
|
|
29 | + document.createElement('form')['__proto__'] | |
|
|
27 | 30 | }, |
|
|
28 | 31 | |
|
|
29 | 32 | ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>', |
| @@ -83,12 +86,13 | |||
|
|
83 | 86 | var property = properties[i], value = source[property]; |
|
|
84 | 87 | if (ancestor && Object.isFunction(value) && |
|
|
85 | 88 | value.argumentNames().first() == "$super") { |
|
|
86 | - var method = value, value = Object.extend((function(m) { | |
|
|
89 | + var method = value; | |
|
|
90 | + value = (function(m) { | |
|
|
87 | 91 | return function() { return ancestor[m].apply(this, arguments) }; |
|
|
88 |
- })(property).wrap(method) |
|
|
|
89 | - valueOf: function() { return method }, | |
|
|
90 | - toString: function() { return method.toString() } | |
|
|
91 | - }); | |
|
|
92 | + })(property).wrap(method); | |
|
|
93 | + | |
|
|
94 | + value.valueOf = method.valueOf.bind(method); | |
|
|
95 | + value.toString = method.toString.bind(method); | |
|
|
92 | 96 | } |
|
|
93 | 97 | this.prototype[property] = value; |
|
|
94 | 98 | } |
| @@ -110,7 +114,7 | |||
|
|
110 | 114 | try { |
|
|
111 | 115 | if (Object.isUndefined(object)) return 'undefined'; |
|
|
112 | 116 | if (object === null) return 'null'; |
|
|
113 |
- return object.inspect ? object.inspect() : object |
|
|
|
117 | + return object.inspect ? object.inspect() : String(object); | |
|
|
114 | 118 | } catch (e) { |
|
|
115 | 119 | if (e instanceof RangeError) return '...'; |
|
|
116 | 120 | throw e; |
| @@ -167,11 +171,12 | |||
|
|
167 | 171 | }, |
|
|
168 | 172 | |
|
|
169 | 173 | isElement: function(object) { |
|
|
170 | - return object && object.nodeType == 1; | |
|
|
174 | + return !!(object && object.nodeType == 1); | |
|
|
171 | 175 | }, |
|
|
172 | 176 | |
|
|
173 | 177 | isArray: function(object) { |
|
|
174 | - return object && object.constructor === Array; | |
|
|
178 | + return object != null && typeof object == "object" && | |
|
|
179 | + 'splice' in object && 'join' in object; | |
|
|
175 | 180 | }, |
|
|
176 | 181 | |
|
|
177 | 182 | isHash: function(object) { |
| @@ -197,7 +202,8 | |||
|
|
197 | 202 | |
|
|
198 | 203 | Object.extend(Function.prototype, { |
|
|
199 | 204 | argumentNames: function() { |
|
|
200 |
- var names = this.toString().match(/^[\s\(]*function[^(]*\(( |
|
|
|
205 | + var names = this.toString().match(/^[\s\(]*function[^(]*\(([^\)]*)\)/)[1] | |
|
|
206 | + .replace(/\s+/g, '').split(','); | |
|
|
201 | 207 | return names.length == 1 && !names[0] ? [] : names; |
|
|
202 | 208 | }, |
|
|
203 | 209 | |
| @@ -231,6 +237,11 | |||
|
|
231 | 237 | }, timeout); |
|
|
232 | 238 | }, |
|
|
233 | 239 | |
|
|
240 | + defer: function() { | |
|
|
241 | + var args = [0.01].concat($A(arguments)); | |
|
|
242 | + return this.delay.apply(this, args); | |
|
|
243 | + }, | |
|
|
244 | + | |
|
|
234 | 245 | wrap: function(wrapper) { |
|
|
235 | 246 | var __method = this; |
|
|
236 | 247 | return function() { |
| @@ -247,8 +258,6 | |||
|
|
247 | 258 | } |
|
|
248 | 259 | }); |
|
|
249 | 260 | |
|
|
250 | - Function.prototype.defer = Function.prototype.delay.curry(0.01); | |
|
|
251 | - | |
|
|
252 | 261 | Date.prototype.toJSON = function() { |
|
|
253 | 262 | return '"' + this.getUTCFullYear() + '-' + |
|
|
254 | 263 | (this.getUTCMonth() + 1).toPaddedString(2) + '-' + |
| @@ -529,7 +538,7 | |||
|
|
529 | 538 | return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>'); |
|
|
530 | 539 | }, |
|
|
531 | 540 | unescapeHTML: function() { |
|
|
532 | - return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>'); | |
|
|
541 | + return this.stripTags().replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>'); | |
|
|
533 | 542 | } |
|
|
534 | 543 | }); |
|
|
535 | 544 | |
| @@ -546,7 +555,7 | |||
|
|
546 | 555 | text: document.createTextNode('') |
|
|
547 | 556 | }); |
|
|
548 | 557 | |
|
|
549 | - with (String.prototype.escapeHTML) div.appendChild(text); | |
|
|
558 | + String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text); | |
|
|
550 | 559 | |
|
|
551 | 560 | var Template = Class.create({ |
|
|
552 | 561 | initialize: function(template, pattern) { |
| @@ -578,7 +587,7 | |||
|
|
578 | 587 | } |
|
|
579 | 588 | |
|
|
580 | 589 | return before + String.interpret(ctx); |
|
|
581 | - }.bind(this)); | |
|
|
590 | + }); | |
|
|
582 | 591 | } |
|
|
583 | 592 | }); |
|
|
584 | 593 | Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/; |
| @@ -588,10 +597,9 | |||
|
|
588 | 597 | var Enumerable = { |
|
|
589 | 598 | each: function(iterator, context) { |
|
|
590 | 599 | var index = 0; |
|
|
591 | - iterator = iterator.bind(context); | |
|
|
592 | 600 | try { |
|
|
593 | 601 | this._each(function(value) { |
|
|
594 | - iterator(value, index++); | |
|
|
602 | + iterator.call(context, value, index++); | |
|
|
595 | 603 | }); |
|
|
596 | 604 | } catch (e) { |
|
|
597 | 605 | if (e != $break) throw e; |
| @@ -600,47 +608,46 | |||
|
|
600 | 608 | }, |
|
|
601 | 609 | |
|
|
602 | 610 | eachSlice: function(number, iterator, context) { |
|
|
603 | - iterator = iterator ? iterator.bind(context) : Prototype.K; | |
|
|
604 | 611 | var index = -number, slices = [], array = this.toArray(); |
|
|
612 | + if (number < 1) return array; | |
|
|
605 | 613 | while ((index += number) < array.length) |
|
|
606 | 614 | slices.push(array.slice(index, index+number)); |
|
|
607 | 615 | return slices.collect(iterator, context); |
|
|
608 | 616 | }, |
|
|
609 | 617 | |
|
|
610 | 618 | all: function(iterator, context) { |
|
|
611 |
- iterator = iterator |
|
|
|
619 | + iterator = iterator || Prototype.K; | |
|
|
612 | 620 | var result = true; |
|
|
613 | 621 | this.each(function(value, index) { |
|
|
614 | - result = result && !!iterator(value, index); | |
|
|
622 | + result = result && !!iterator.call(context, value, index); | |
|
|
615 | 623 | if (!result) throw $break; |
|
|
616 | 624 | }); |
|
|
617 | 625 | return result; |
|
|
618 | 626 | }, |
|
|
619 | 627 | |
|
|
620 | 628 | any: function(iterator, context) { |
|
|
621 |
- iterator = iterator |
|
|
|
629 | + iterator = iterator || Prototype.K; | |
|
|
622 | 630 | var result = false; |
|
|
623 | 631 | this.each(function(value, index) { |
|
|
624 | - if (result = !!iterator(value, index)) | |
|
|
632 | + if (result = !!iterator.call(context, value, index)) | |
|
|
625 | 633 | throw $break; |
|
|
626 | 634 | }); |
|
|
627 | 635 | return result; |
|
|
628 | 636 | }, |
|
|
629 | 637 | |
|
|
630 | 638 | collect: function(iterator, context) { |
|
|
631 |
- iterator = iterator |
|
|
|
639 | + iterator = iterator || Prototype.K; | |
|
|
632 | 640 | var results = []; |
|
|
633 | 641 | this.each(function(value, index) { |
|
|
634 | - results.push(iterator(value, index)); | |
|
|
642 | + results.push(iterator.call(context, value, index)); | |
|
|
635 | 643 | }); |
|
|
636 | 644 | return results; |
|
|
637 | 645 | }, |
|
|
638 | 646 | |
|
|
639 | 647 | detect: function(iterator, context) { |
|
|
640 | - iterator = iterator.bind(context); | |
|
|
641 | 648 | var result; |
|
|
642 | 649 | this.each(function(value, index) { |
|
|
643 | - if (iterator(value, index)) { | |
|
|
650 | + if (iterator.call(context, value, index)) { | |
|
|
644 | 651 | result = value; |
|
|
645 | 652 | throw $break; |
|
|
646 | 653 | } |
| @@ -649,17 +656,16 | |||
|
|
649 | 656 | }, |
|
|
650 | 657 | |
|
|
651 | 658 | findAll: function(iterator, context) { |
|
|
652 | - iterator = iterator.bind(context); | |
|
|
653 | 659 | var results = []; |
|
|
654 | 660 | this.each(function(value, index) { |
|
|
655 | - if (iterator(value, index)) | |
|
|
661 | + if (iterator.call(context, value, index)) | |
|
|
656 | 662 | results.push(value); |
|
|
657 | 663 | }); |
|
|
658 | 664 | return results; |
|
|
659 | 665 | }, |
|
|
660 | 666 | |
|
|
661 | 667 | grep: function(filter, iterator, context) { |
|
|
662 |
- iterator = iterator |
|
|
|
668 | + iterator = iterator || Prototype.K; | |
|
|
663 | 669 | var results = []; |
|
|
664 | 670 | |
|
|
665 | 671 | if (Object.isString(filter)) |
| @@ -667,7 +673,7 | |||
|
|
667 | 673 | |
|
|
668 | 674 | this.each(function(value, index) { |
|
|
669 | 675 | if (filter.match(value)) |
|
|
670 | - results.push(iterator(value, index)); | |
|
|
676 | + results.push(iterator.call(context, value, index)); | |
|
|
671 | 677 | }); |
|
|
672 | 678 | return results; |
|
|
673 | 679 | }, |
| @@ -695,9 +701,8 | |||
|
|
695 | 701 | }, |
|
|
696 | 702 | |
|
|
697 | 703 | inject: function(memo, iterator, context) { |
|
|
698 | - iterator = iterator.bind(context); | |
|
|
699 | 704 | this.each(function(value, index) { |
|
|
700 | - memo = iterator(memo, value, index); | |
|
|
705 | + memo = iterator.call(context, memo, value, index); | |
|
|
701 | 706 | }); |
|
|
702 | 707 | return memo; |
|
|
703 | 708 | }, |
| @@ -710,10 +715,10 | |||
|
|
710 | 715 | }, |
|
|
711 | 716 | |
|
|
712 | 717 | max: function(iterator, context) { |
|
|
713 |
- iterator = iterator |
|
|
|
718 | + iterator = iterator || Prototype.K; | |
|
|
714 | 719 | var result; |
|
|
715 | 720 | this.each(function(value, index) { |
|
|
716 | - value = iterator(value, index); | |
|
|
721 | + value = iterator.call(context, value, index); | |
|
|
717 | 722 | if (result == null || value >= result) |
|
|
718 | 723 | result = value; |
|
|
719 | 724 | }); |
| @@ -721,10 +726,10 | |||
|
|
721 | 726 | }, |
|
|
722 | 727 | |
|
|
723 | 728 | min: function(iterator, context) { |
|
|
724 |
- iterator = iterator |
|
|
|
729 | + iterator = iterator || Prototype.K; | |
|
|
725 | 730 | var result; |
|
|
726 | 731 | this.each(function(value, index) { |
|
|
727 | - value = iterator(value, index); | |
|
|
732 | + value = iterator.call(context, value, index); | |
|
|
728 | 733 | if (result == null || value < result) |
|
|
729 | 734 | result = value; |
|
|
730 | 735 | }); |
| @@ -732,10 +737,10 | |||
|
|
732 | 737 | }, |
|
|
733 | 738 | |
|
|
734 | 739 | partition: function(iterator, context) { |
|
|
735 |
- iterator = iterator |
|
|
|
740 | + iterator = iterator || Prototype.K; | |
|
|
736 | 741 | var trues = [], falses = []; |
|
|
737 | 742 | this.each(function(value, index) { |
|
|
738 | - (iterator(value, index) ? | |
|
|
743 | + (iterator.call(context, value, index) ? | |
|
|
739 | 744 | trues : falses).push(value); |
|
|
740 | 745 | }); |
|
|
741 | 746 | return [trues, falses]; |
| @@ -750,19 +755,20 | |||
|
|
750 | 755 | }, |
|
|
751 | 756 | |
|
|
752 | 757 | reject: function(iterator, context) { |
|
|
753 | - iterator = iterator.bind(context); | |
|
|
754 | 758 | var results = []; |
|
|
755 | 759 | this.each(function(value, index) { |
|
|
756 | - if (!iterator(value, index)) | |
|
|
760 | + if (!iterator.call(context, value, index)) | |
|
|
757 | 761 | results.push(value); |
|
|
758 | 762 | }); |
|
|
759 | 763 | return results; |
|
|
760 | 764 | }, |
|
|
761 | 765 | |
|
|
762 | 766 | sortBy: function(iterator, context) { |
|
|
763 | - iterator = iterator.bind(context); | |
|
|
764 | 767 | return this.map(function(value, index) { |
|
|
765 | - return {value: value, criteria: iterator(value, index)}; | |
|
|
768 | + return { | |
|
|
769 | + value: value, | |
|
|
770 | + criteria: iterator.call(context, value, index) | |
|
|
771 | + }; | |
|
|
766 | 772 | }).sort(function(left, right) { |
|
|
767 | 773 | var a = left.criteria, b = right.criteria; |
|
|
768 | 774 | return a < b ? -1 : a > b ? 1 : 0; |
| @@ -806,20 +812,24 | |||
|
|
806 | 812 | function $A(iterable) { |
|
|
807 | 813 | if (!iterable) return []; |
|
|
808 | 814 | if (iterable.toArray) return iterable.toArray(); |
|
|
809 | - var length = iterable.length, results = new Array(length); | |
|
|
815 | + var length = iterable.length || 0, results = new Array(length); | |
|
|
810 | 816 | while (length--) results[length] = iterable[length]; |
|
|
811 | 817 | return results; |
|
|
812 | 818 | } |
|
|
813 | 819 | |
|
|
814 | 820 | if (Prototype.Browser.WebKit) { |
|
|
815 |
- function |
|
|
|
821 | + $A = function(iterable) { | |
|
|
816 | 822 | if (!iterable) return []; |
|
|
817 | - if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') && | |
|
|
818 | - iterable.toArray) return iterable.toArray(); | |
|
|
819 | - var length = iterable.length, results = new Array(length); | |
|
|
823 | + // In Safari, only use the `toArray` method if it's not a NodeList. | |
|
|
824 | + // A NodeList is a function, has an function `item` property, and a numeric | |
|
|
825 | + // `length` property. Adapted from Google Doctype. | |
|
|
826 | + if (!(typeof iterable === 'function' && typeof iterable.length === | |
|
|
827 | + 'number' && typeof iterable.item === 'function') && iterable.toArray) | |
|
|
828 | + return iterable.toArray(); | |
|
|
829 | + var length = iterable.length || 0, results = new Array(length); | |
|
|
820 | 830 | while (length--) results[length] = iterable[length]; |
|
|
821 | 831 | return results; |
|
|
822 | - } | |
|
|
832 | + }; | |
|
|
823 | 833 | } |
|
|
824 | 834 | |
|
|
825 | 835 | Array.from = $A; |
| @@ -962,8 +972,8 | |||
|
|
962 | 972 | return this + 1; |
|
|
963 | 973 | }, |
|
|
964 | 974 | |
|
|
965 | - times: function(iterator) { | |
|
|
966 | - $R(0, this, true).each(iterator); | |
|
|
975 | + times: function(iterator, context) { | |
|
|
976 | + $R(0, this, true).each(iterator, context); | |
|
|
967 | 977 | return this; |
|
|
968 | 978 | }, |
|
|
969 | 979 | |
| @@ -1010,7 +1020,9 | |||
|
|
1010 | 1020 | }, |
|
|
1011 | 1021 | |
|
|
1012 | 1022 | get: function(key) { |
|
|
1013 | - return this._object[key]; | |
|
|
1023 | + // simulating poorly supported hasOwnProperty | |
|
|
1024 | + if (this._object[key] !== Object.prototype[key]) | |
|
|
1025 | + return this._object[key]; | |
|
|
1014 | 1026 | }, |
|
|
1015 | 1027 | |
|
|
1016 | 1028 | unset: function(key) { |
| @@ -1050,14 +1062,14 | |||
|
|
1050 | 1062 | }, |
|
|
1051 | 1063 | |
|
|
1052 | 1064 | toQueryString: function() { |
|
|
1053 |
- return this. |
|
|
|
1065 | + return this.inject([], function(results, pair) { | |
|
|
1054 | 1066 | var key = encodeURIComponent(pair.key), values = pair.value; |
|
|
1055 | 1067 | |
|
|
1056 | 1068 | if (values && typeof values == 'object') { |
|
|
1057 | 1069 | if (Object.isArray(values)) |
|
|
1058 |
- return values.map(toQueryPair.curry(key)) |
|
|
|
1059 | - } | |
|
|
1060 |
- return |
|
|
|
1070 | + return results.concat(values.map(toQueryPair.curry(key))); | |
|
|
1071 | + } else results.push(toQueryPair(key, values)); | |
|
|
1072 | + return results; | |
|
|
1061 | 1073 | }).join('&'); |
|
|
1062 | 1074 | }, |
|
|
1063 | 1075 | |
| @@ -1298,7 +1310,7 | |||
|
|
1298 | 1310 | |
|
|
1299 | 1311 | var contentType = response.getHeader('Content-type'); |
|
|
1300 | 1312 | if (this.options.evalJS == 'force' |
|
|
1301 | - || (this.options.evalJS && contentType | |
|
|
1313 | + || (this.options.evalJS && this.isSameOrigin() && contentType | |
|
|
1302 | 1314 | && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i))) |
|
|
1303 | 1315 | this.evalResponse(); |
|
|
1304 | 1316 | } |
| @@ -1316,9 +1328,18 | |||
|
|
1316 | 1328 | } |
|
|
1317 | 1329 | }, |
|
|
1318 | 1330 | |
|
|
1331 | + isSameOrigin: function() { | |
|
|
1332 | + var m = this.url.match(/^\s*https?:\/\/[^\/]*/); | |
|
|
1333 | + return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({ | |
|
|
1334 | + protocol: location.protocol, | |
|
|
1335 | + domain: document.domain, | |
|
|
1336 | + port: location.port ? ':' + location.port : '' | |
|
|
1337 | + })); | |
|
|
1338 | + }, | |
|
|
1339 | + | |
|
|
1319 | 1340 | getHeader: function(name) { |
|
|
1320 | 1341 | try { |
|
|
1321 | - return this.transport.getResponseHeader(name); | |
|
|
1342 | + return this.transport.getResponseHeader(name) || null; | |
|
|
1322 | 1343 | } catch (e) { return null } |
|
|
1323 | 1344 | }, |
|
|
1324 | 1345 | |
| @@ -1391,7 +1412,8 | |||
|
|
1391 | 1412 | if (!json) return null; |
|
|
1392 | 1413 | json = decodeURIComponent(escape(json)); |
|
|
1393 | 1414 | try { |
|
|
1394 |
- return json.evalJSON(this.request.options.sanitizeJSON |
|
|
|
1415 | + return json.evalJSON(this.request.options.sanitizeJSON || | |
|
|
1416 | + !this.request.isSameOrigin()); | |
|
|
1395 | 1417 | } catch (e) { |
|
|
1396 | 1418 | this.request.dispatchException(e); |
|
|
1397 | 1419 | } |
| @@ -1404,7 +1426,8 | |||
|
|
1404 | 1426 | this.responseText.blank()) |
|
|
1405 | 1427 | return null; |
|
|
1406 | 1428 | try { |
|
|
1407 |
- return this.responseText.evalJSON(options.sanitizeJSON |
|
|
|
1429 | + return this.responseText.evalJSON(options.sanitizeJSON || | |
|
|
1430 | + !this.request.isSameOrigin()); | |
|
|
1408 | 1431 | } catch (e) { |
|
|
1409 | 1432 | this.request.dispatchException(e); |
|
|
1410 | 1433 | } |
| @@ -1546,6 +1569,7 | |||
|
|
1546 | 1569 | return Element.writeAttribute(cache[tagName].cloneNode(false), attributes); |
|
|
1547 | 1570 | }; |
|
|
1548 | 1571 | Object.extend(this.Element, element || { }); |
|
|
1572 | + if (element) this.Element.prototype = element.prototype; | |
|
|
1549 | 1573 | }).call(window); |
|
|
1550 | 1574 | |
|
|
1551 | 1575 | Element.cache = { }; |
| @@ -1562,12 +1586,14 | |||
|
|
1562 | 1586 | }, |
|
|
1563 | 1587 | |
|
|
1564 | 1588 | hide: function(element) { |
|
|
1565 | - $(element).style.display = 'none'; | |
|
|
1589 | + element = $(element); | |
|
|
1590 | + element.style.display = 'none'; | |
|
|
1566 | 1591 | return element; |
|
|
1567 | 1592 | }, |
|
|
1568 | 1593 | |
|
|
1569 | 1594 | show: function(element) { |
|
|
1570 | - $(element).style.display = ''; | |
|
|
1595 | + element = $(element); | |
|
|
1596 | + element.style.display = ''; | |
|
|
1571 | 1597 | return element; |
|
|
1572 | 1598 | }, |
|
|
1573 | 1599 | |
| @@ -1608,24 +1634,28 | |||
|
|
1608 | 1634 | Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML))) |
|
|
1609 | 1635 | insertions = {bottom:insertions}; |
|
|
1610 | 1636 | |
|
|
1611 |
- var content, t, |
|
|
|
1612 | - | |
|
|
1613 | - for (position in insertions) { | |
|
|
1637 | + var content, insert, tagName, childNodes; | |
|
|
1638 | + | |
|
|
1639 | + for (var position in insertions) { | |
|
|
1614 | 1640 | content = insertions[position]; |
|
|
1615 | 1641 | position = position.toLowerCase(); |
|
|
1616 | - t = Element._insertionTranslations[position]; | |
|
|
1642 | + insert = Element._insertionTranslations[position]; | |
|
|
1617 | 1643 | |
|
|
1618 | 1644 | if (content && content.toElement) content = content.toElement(); |
|
|
1619 | 1645 | if (Object.isElement(content)) { |
|
|
1620 |
- |
|
|
|
1646 | + insert(element, content); | |
|
|
1621 | 1647 | continue; |
|
|
1622 | 1648 | } |
|
|
1623 | 1649 | |
|
|
1624 | 1650 | content = Object.toHTML(content); |
|
|
1625 | 1651 | |
|
|
1626 | - range = element.ownerDocument.createRange(); | |
|
|
1627 | - t.initializeRange(element, range); | |
|
|
1628 | - t.insert(element, range.createContextualFragment(content.stripScripts())); | |
|
|
1652 | + tagName = ((position == 'before' || position == 'after') | |
|
|
1653 | + ? element.parentNode : element).tagName.toUpperCase(); | |
|
|
1654 | + | |
|
|
1655 | + childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts()); | |
|
|
1656 | + | |
|
|
1657 | + if (position == 'top' || position == 'after') childNodes.reverse(); | |
|
|
1658 | + childNodes.each(insert.curry(element)); | |
|
|
1629 | 1659 | |
|
|
1630 | 1660 | content.evalScripts.bind(content).defer(); |
|
|
1631 | 1661 | } |
| @@ -1670,7 +1700,7 | |||
|
|
1670 | 1700 | }, |
|
|
1671 | 1701 | |
|
|
1672 | 1702 | descendants: function(element) { |
|
|
1673 |
- return $(element). |
|
|
|
1703 | + return $(element).select("*"); | |
|
|
1674 | 1704 | }, |
|
|
1675 | 1705 | |
|
|
1676 | 1706 | firstDescendant: function(element) { |
| @@ -1709,32 +1739,31 | |||
|
|
1709 | 1739 | element = $(element); |
|
|
1710 | 1740 | if (arguments.length == 1) return $(element.parentNode); |
|
|
1711 | 1741 | var ancestors = element.ancestors(); |
|
|
1712 |
- return expression ? |
|
|
|
1713 | - ancestors[index || 0]; | |
|
|
1742 | + return Object.isNumber(expression) ? ancestors[expression] : | |
|
|
1743 | + Selector.findElement(ancestors, expression, index); | |
|
|
1714 | 1744 | }, |
|
|
1715 | 1745 | |
|
|
1716 | 1746 | down: function(element, expression, index) { |
|
|
1717 | 1747 | element = $(element); |
|
|
1718 | 1748 | if (arguments.length == 1) return element.firstDescendant(); |
|
|
1719 | - var descendants = element.descendants(); | |
|
|
1720 | - return expression ? Selector.findElement(descendants, expression, index) : | |
|
|
1721 | - descendants[index || 0]; | |
|
|
1749 | + return Object.isNumber(expression) ? element.descendants()[expression] : | |
|
|
1750 | + Element.select(element, expression)[index || 0]; | |
|
|
1722 | 1751 | }, |
|
|
1723 | 1752 | |
|
|
1724 | 1753 | previous: function(element, expression, index) { |
|
|
1725 | 1754 | element = $(element); |
|
|
1726 | 1755 | if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element)); |
|
|
1727 | 1756 | var previousSiblings = element.previousSiblings(); |
|
|
1728 |
- return expression ? |
|
|
|
1729 | - previousSiblings[index || 0]; | |
|
|
1757 | + return Object.isNumber(expression) ? previousSiblings[expression] : | |
|
|
1758 | + Selector.findElement(previousSiblings, expression, index); | |
|
|
1730 | 1759 | }, |
|
|
1731 | 1760 | |
|
|
1732 | 1761 | next: function(element, expression, index) { |
|
|
1733 | 1762 | element = $(element); |
|
|
1734 | 1763 | if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element)); |
|
|
1735 | 1764 | var nextSiblings = element.nextSiblings(); |
|
|
1736 |
- return expression ? |
|
|
|
1737 | - nextSiblings[index || 0]; | |
|
|
1765 | + return Object.isNumber(expression) ? nextSiblings[expression] : | |
|
|
1766 | + Selector.findElement(nextSiblings, expression, index); | |
|
|
1738 | 1767 | }, |
|
|
1739 | 1768 | |
|
|
1740 | 1769 | select: function() { |
| @@ -1848,23 +1877,16 | |||
|
|
1848 | 1877 | |
|
|
1849 | 1878 | descendantOf: function(element, ancestor) { |
|
|
1850 | 1879 | element = $(element), ancestor = $(ancestor); |
|
|
1851 | - var originalAncestor = ancestor; | |
|
|
1852 | 1880 | |
|
|
1853 | 1881 | if (element.compareDocumentPosition) |
|
|
1854 | 1882 | return (element.compareDocumentPosition(ancestor) & 8) === 8; |
|
|
1855 | 1883 | |
|
|
1856 | - if (element.sourceIndex && !Prototype.Browser.Opera) { | |
|
|
1857 | - var e = element.sourceIndex, a = ancestor.sourceIndex, | |
|
|
1858 | - nextAncestor = ancestor.nextSibling; | |
|
|
1859 | - if (!nextAncestor) { | |
|
|
1860 | - do { ancestor = ancestor.parentNode; } | |
|
|
1861 | - while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode); | |
|
|
1862 | - } | |
|
|
1863 | - if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex); | |
|
|
1864 | - } | |
|
|
1884 | + if (ancestor.contains) | |
|
|
1885 | + return ancestor.contains(element) && ancestor !== element; | |
|
|
1865 | 1886 | |
|
|
1866 | 1887 | while (element = element.parentNode) |
|
|
1867 |
- if (element == |
|
|
|
1888 | + if (element == ancestor) return true; | |
|
|
1889 | + | |
|
|
1868 | 1890 | return false; |
|
|
1869 | 1891 | }, |
|
|
1870 | 1892 | |
| @@ -1879,7 +1901,7 | |||
|
|
1879 | 1901 | element = $(element); |
|
|
1880 | 1902 | style = style == 'float' ? 'cssFloat' : style.camelize(); |
|
|
1881 | 1903 | var value = element.style[style]; |
|
|
1882 | - if (!value) { | |
|
|
1904 | + if (!value || value == 'auto') { | |
|
|
1883 | 1905 | var css = document.defaultView.getComputedStyle(element, null); |
|
|
1884 | 1906 | value = css ? css[style] : null; |
|
|
1885 | 1907 | } |
| @@ -1918,7 +1940,7 | |||
|
|
1918 | 1940 | |
|
|
1919 | 1941 | getDimensions: function(element) { |
|
|
1920 | 1942 | element = $(element); |
|
|
1921 |
- var display = |
|
|
|
1943 | + var display = element.getStyle('display'); | |
|
|
1922 | 1944 | if (display != 'none' && display != null) // Safari bug |
|
|
1923 | 1945 | return {width: element.offsetWidth, height: element.offsetHeight}; |
|
|
1924 | 1946 | |
| @@ -1947,7 +1969,7 | |||
|
|
1947 | 1969 | element.style.position = 'relative'; |
|
|
1948 | 1970 | // Opera returns the offset relative to the positioning context, when an |
|
|
1949 | 1971 | // element is position relative but top and left have not been defined |
|
|
1950 |
- if ( |
|
|
|
1972 | + if (Prototype.Browser.Opera) { | |
|
|
1951 | 1973 | element.style.top = 0; |
|
|
1952 | 1974 | element.style.left = 0; |
|
|
1953 | 1975 | } |
| @@ -2002,9 +2024,9 | |||
|
|
2002 | 2024 | valueL += element.offsetLeft || 0; |
|
|
2003 | 2025 | element = element.offsetParent; |
|
|
2004 | 2026 | if (element) { |
|
|
2005 | - if (element.tagName == 'BODY') break; | |
|
|
2027 | + if (element.tagName.toUpperCase() == 'BODY') break; | |
|
|
2006 | 2028 | var p = Element.getStyle(element, 'position'); |
|
|
2007 |
- if (p == ' |
|
|
|
2029 | + if (p !== 'static') break; | |
|
|
2008 | 2030 | } |
|
|
2009 | 2031 | } while (element); |
|
|
2010 | 2032 | return Element._returnOffset(valueL, valueT); |
| @@ -2012,7 +2034,7 | |||
|
|
2012 | 2034 | |
|
|
2013 | 2035 | absolutize: function(element) { |
|
|
2014 | 2036 | element = $(element); |
|
|
2015 | - if (element.getStyle('position') == 'absolute') return; | |
|
|
2037 | + if (element.getStyle('position') == 'absolute') return element; | |
|
|
2016 | 2038 | // Position.prepare(); // To be done manually by Scripty when it needs it. |
|
|
2017 | 2039 | |
|
|
2018 | 2040 | var offsets = element.positionedOffset(); |
| @@ -2036,7 +2058,7 | |||
|
|
2036 | 2058 | |
|
|
2037 | 2059 | relativize: function(element) { |
|
|
2038 | 2060 | element = $(element); |
|
|
2039 | - if (element.getStyle('position') == 'relative') return; | |
|
|
2061 | + if (element.getStyle('position') == 'relative') return element; | |
|
|
2040 | 2062 | // Position.prepare(); // To be done manually by Scripty when it needs it. |
|
|
2041 | 2063 | |
|
|
2042 | 2064 | element.style.position = 'relative'; |
| @@ -2087,7 +2109,7 | |||
|
|
2087 | 2109 | |
|
|
2088 | 2110 | element = forElement; |
|
|
2089 | 2111 | do { |
|
|
2090 | - if (!Prototype.Browser.Opera || element.tagName == 'BODY') { | |
|
|
2112 | + if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) { | |
|
|
2091 | 2113 | valueT -= element.scrollTop || 0; |
|
|
2092 | 2114 | valueL -= element.scrollLeft || 0; |
|
|
2093 | 2115 | } |
| @@ -2153,46 +2175,6 | |||
|
|
2153 | 2175 | } |
|
|
2154 | 2176 | }; |
|
|
2155 | 2177 | |
|
|
2156 | - | |
|
|
2157 | - if (!document.createRange || Prototype.Browser.Opera) { | |
|
|
2158 | - Element.Methods.insert = function(element, insertions) { | |
|
|
2159 | - element = $(element); | |
|
|
2160 | - | |
|
|
2161 | - if (Object.isString(insertions) || Object.isNumber(insertions) || | |
|
|
2162 | - Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML))) | |
|
|
2163 | - insertions = { bottom: insertions }; | |
|
|
2164 | - | |
|
|
2165 | - var t = Element._insertionTranslations, content, position, pos, tagName; | |
|
|
2166 | - | |
|
|
2167 | - for (position in insertions) { | |
|
|
2168 | - content = insertions[position]; | |
|
|
2169 | - position = position.toLowerCase(); | |
|
|
2170 | - pos = t[position]; | |
|
|
2171 | - | |
|
|
2172 | - if (content && content.toElement) content = content.toElement(); | |
|
|
2173 | - if (Object.isElement(content)) { | |
|
|
2174 | - pos.insert(element, content); | |
|
|
2175 | - continue; | |
|
|
2176 | - } | |
|
|
2177 | - | |
|
|
2178 | - content = Object.toHTML(content); | |
|
|
2179 | - tagName = ((position == 'before' || position == 'after') | |
|
|
2180 | - ? element.parentNode : element).tagName.toUpperCase(); | |
|
|
2181 | - | |
|
|
2182 | - if (t.tags[tagName]) { | |
|
|
2183 | - var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts()); | |
|
|
2184 | - if (position == 'top' || position == 'after') fragments.reverse(); | |
|
|
2185 | - fragments.each(pos.insert.curry(element)); | |
|
|
2186 | - } | |
|
|
2187 | - else element.insertAdjacentHTML(pos.adjacency, content.stripScripts()); | |
|
|
2188 | - | |
|
|
2189 | - content.evalScripts.bind(content).defer(); | |
|
|
2190 | - } | |
|
|
2191 | - | |
|
|
2192 | - return element; | |
|
|
2193 | - }; | |
|
|
2194 | - } | |
|
|
2195 | - | |
|
|
2196 | 2178 | if (Prototype.Browser.Opera) { |
|
|
2197 | 2179 | Element.Methods.getStyle = Element.Methods.getStyle.wrap( |
|
|
2198 | 2180 | function(proceed, element, style) { |
| @@ -2237,12 +2219,36 | |||
|
|
2237 | 2219 | } |
|
|
2238 | 2220 | |
|
|
2239 | 2221 | else if (Prototype.Browser.IE) { |
|
|
2240 | - $w('positionedOffset getOffsetParent viewportOffset').each(function(method) { | |
|
|
2222 | + // IE doesn't report offsets correctly for static elements, so we change them | |
|
|
2223 | + // to "relative" to get the values, then change them back. | |
|
|
2224 | + Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap( | |
|
|
2225 | + function(proceed, element) { | |
|
|
2226 | + element = $(element); | |
|
|
2227 | + // IE throws an error if element is not in document | |
|
|
2228 | + try { element.offsetParent } | |
|
|
2229 | + catch(e) { return $(document.body) } | |
|
|
2230 | + var position = element.getStyle('position'); | |
|
|
2231 | + if (position !== 'static') return proceed(element); | |
|
|
2232 | + element.setStyle({ position: 'relative' }); | |
|
|
2233 | + var value = proceed(element); | |
|
|
2234 | + element.setStyle({ position: position }); | |
|
|
2235 | + return value; | |
|
|
2236 | + } | |
|
|
2237 | + ); | |
|
|
2238 | + | |
|
|
2239 | + $w('positionedOffset viewportOffset').each(function(method) { | |
|
|
2241 | 2240 | Element.Methods[method] = Element.Methods[method].wrap( |
|
|
2242 | 2241 | function(proceed, element) { |
|
|
2243 | 2242 | element = $(element); |
|
|
2243 | + try { element.offsetParent } | |
|
|
2244 | + catch(e) { return Element._returnOffset(0,0) } | |
|
|
2244 | 2245 | var position = element.getStyle('position'); |
|
|
2245 | - if (position != 'static') return proceed(element); | |
|
|
2246 | + if (position !== 'static') return proceed(element); | |
|
|
2247 | + // Trigger hasLayout on the offset parent so that IE6 reports | |
|
|
2248 | + // accurate offsetTop and offsetLeft values for position: fixed. | |
|
|
2249 | + var offsetParent = element.getOffsetParent(); | |
|
|
2250 | + if (offsetParent && offsetParent.getStyle('position') === 'fixed') | |
|
|
2251 | + offsetParent.setStyle({ zoom: 1 }); | |
|
|
2246 | 2252 | element.setStyle({ position: 'relative' }); |
|
|
2247 | 2253 | var value = proceed(element); |
|
|
2248 | 2254 | element.setStyle({ position: position }); |
| @@ -2251,6 +2257,14 | |||
|
|
2251 | 2257 | ); |
|
|
2252 | 2258 | }); |
|
|
2253 | 2259 | |
|
|
2260 | + Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap( | |
|
|
2261 | + function(proceed, element) { | |
|
|
2262 | + try { element.offsetParent } | |
|
|
2263 | + catch(e) { return Element._returnOffset(0,0) } | |
|
|
2264 | + return proceed(element); | |
|
|
2265 | + } | |
|
|
2266 | + ); | |
|
|
2267 | + | |
|
|
2254 | 2268 | Element.Methods.getStyle = function(element, style) { |
|
|
2255 | 2269 | element = $(element); |
|
|
2256 | 2270 | style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize(); |
| @@ -2324,7 +2338,10 | |||
|
|
2324 | 2338 | }; |
|
|
2325 | 2339 | |
|
|
2326 | 2340 | Element._attributeTranslations.write = { |
|
|
2327 | - names: Object.clone(Element._attributeTranslations.read.names), | |
|
|
2341 | + names: Object.extend({ | |
|
|
2342 | + cellpadding: 'cellPadding', | |
|
|
2343 | + cellspacing: 'cellSpacing' | |
|
|
2344 | + }, Element._attributeTranslations.read.names), | |
|
|
2328 | 2345 | values: { |
|
|
2329 | 2346 | checked: function(element, value) { |
|
|
2330 | 2347 | element.checked = !!value; |
| @@ -2339,7 +2356,7 | |||
|
|
2339 | 2356 | Element._attributeTranslations.has = {}; |
|
|
2340 | 2357 | |
|
|
2341 | 2358 | $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' + |
|
|
2342 | - 'encType maxLength readOnly longDesc').each(function(attr) { | |
|
|
2359 | + 'encType maxLength readOnly longDesc frameBorder').each(function(attr) { | |
|
|
2343 | 2360 | Element._attributeTranslations.write.names[attr.toLowerCase()] = attr; |
|
|
2344 | 2361 | Element._attributeTranslations.has[attr.toLowerCase()] = attr; |
|
|
2345 | 2362 | }); |
| @@ -2392,7 +2409,7 | |||
|
|
2392 | 2409 | (value < 0.00001) ? 0 : value; |
|
|
2393 | 2410 | |
|
|
2394 | 2411 | if (value == 1) |
|
|
2395 | - if(element.tagName == 'IMG' && element.width) { | |
|
|
2412 | + if(element.tagName.toUpperCase() == 'IMG' && element.width) { | |
|
|
2396 | 2413 | element.width++; element.width--; |
|
|
2397 | 2414 | } else try { |
|
|
2398 | 2415 | var n = document.createTextNode(' '); |
| @@ -2444,7 +2461,7 | |||
|
|
2444 | 2461 | }; |
|
|
2445 | 2462 | } |
|
|
2446 | 2463 | |
|
|
2447 |
- if (document.createElement('div') |
|
|
|
2464 | + if ('outerHTML' in document.createElement('div')) { | |
|
|
2448 | 2465 | Element.Methods.replace = function(element, content) { |
|
|
2449 | 2466 | element = $(element); |
|
|
2450 | 2467 | |
| @@ -2482,45 +2499,25 | |||
|
|
2482 | 2499 | |
|
|
2483 | 2500 | Element._getContentFromAnonymousElement = function(tagName, html) { |
|
|
2484 | 2501 | var div = new Element('div'), t = Element._insertionTranslations.tags[tagName]; |
|
|
2485 | - div.innerHTML = t[0] + html + t[1]; | |
|
|
2486 | - t[2].times(function() { div = div.firstChild }); | |
|
|
2502 | + if (t) { | |
|
|
2503 | + div.innerHTML = t[0] + html + t[1]; | |
|
|
2504 | + t[2].times(function() { div = div.firstChild }); | |
|
|
2505 | + } else div.innerHTML = html; | |
|
|
2487 | 2506 | return $A(div.childNodes); |
|
|
2488 | 2507 | }; |
|
|
2489 | 2508 | |
|
|
2490 | 2509 | Element._insertionTranslations = { |
|
|
2491 | - before: { | |
|
|
2492 | - adjacency: 'beforeBegin', | |
|
|
2493 | - insert: function(element, node) { | |
|
|
2494 | - element.parentNode.insertBefore(node, element); | |
|
|
2495 | - }, | |
|
|
2496 | - initializeRange: function(element, range) { | |
|
|
2497 | - range.setStartBefore(element); | |
|
|
2498 | - } | |
|
|
2499 | - }, | |
|
|
2500 | - top: { | |
|
|
2501 | - adjacency: 'afterBegin', | |
|
|
2502 | - insert: function(element, node) { | |
|
|
2503 | - element.insertBefore(node, element.firstChild); | |
|
|
2504 | - }, | |
|
|
2505 | - initializeRange: function(element, range) { | |
|
|
2506 | - range.selectNodeContents(element); | |
|
|
2507 | - range.collapse(true); | |
|
|
2508 | - } | |
|
|
2509 | - }, | |
|
|
2510 | - bottom: { | |
|
|
2511 | - adjacency: 'beforeEnd', | |
|
|
2512 | - insert: function(element, node) { | |
|
|
2513 | - element.appendChild(node); | |
|
|
2514 | - } | |
|
|
2515 | - }, | |
|
|
2516 | - after: { | |
|
|
2517 | - adjacency: 'afterEnd', | |
|
|
2518 | - insert: function(element, node) { | |
|
|
2519 | - element.parentNode.insertBefore(node, element.nextSibling); | |
|
|
2520 | - }, | |
|
|
2521 | - initializeRange: function(element, range) { | |
|
|
2522 | - range.setStartAfter(element); | |
|
|
2523 | - } | |
|
|
2510 | + before: function(element, node) { | |
|
|
2511 | + element.parentNode.insertBefore(node, element); | |
|
|
2512 | + }, | |
|
|
2513 | + top: function(element, node) { | |
|
|
2514 | + element.insertBefore(node, element.firstChild); | |
|
|
2515 | + }, | |
|
|
2516 | + bottom: function(element, node) { | |
|
|
2517 | + element.appendChild(node); | |
|
|
2518 | + }, | |
|
|
2519 | + after: function(element, node) { | |
|
|
2520 | + element.parentNode.insertBefore(node, element.nextSibling); | |
|
|
2524 | 2521 | }, |
|
|
2525 | 2522 | tags: { |
|
|
2526 | 2523 | TABLE: ['<table>', '</table>', 1], |
| @@ -2532,7 +2529,6 | |||
|
|
2532 | 2529 | }; |
|
|
2533 | 2530 | |
|
|
2534 | 2531 | (function() { |
|
|
2535 | - this.bottom.initializeRange = this.top.initializeRange; | |
|
|
2536 | 2532 | Object.extend(this.tags, { |
|
|
2537 | 2533 | THEAD: this.tags.TBODY, |
|
|
2538 | 2534 | TFOOT: this.tags.TBODY, |
| @@ -2544,7 +2540,7 | |||
|
|
2544 | 2540 | hasAttribute: function(element, attribute) { |
|
|
2545 | 2541 | attribute = Element._attributeTranslations.has[attribute] || attribute; |
|
|
2546 | 2542 | var node = $(element).getAttributeNode(attribute); |
|
|
2547 | - return node && node.specified; | |
|
|
2543 | + return !!(node && node.specified); | |
|
|
2548 | 2544 | } |
|
|
2549 | 2545 | }; |
|
|
2550 | 2546 | |
| @@ -2553,9 +2549,9 | |||
|
|
2553 | 2549 | Object.extend(Element, Element.Methods); |
|
|
2554 | 2550 | |
|
|
2555 | 2551 | if (!Prototype.BrowserFeatures.ElementExtensions && |
|
|
2556 |
- document.createElement('div') |
|
|
|
2552 | + document.createElement('div')['__proto__']) { | |
|
|
2557 | 2553 | window.HTMLElement = { }; |
|
|
2558 |
- window.HTMLElement.prototype = document.createElement('div') |
|
|
|
2554 | + window.HTMLElement.prototype = document.createElement('div')['__proto__']; | |
|
|
2559 | 2555 | Prototype.BrowserFeatures.ElementExtensions = true; |
|
|
2560 | 2556 | } |
|
|
2561 | 2557 | |
| @@ -2570,7 +2566,7 | |||
|
|
2570 | 2566 | element.nodeType != 1 || element == window) return element; |
|
|
2571 | 2567 | |
|
|
2572 | 2568 | var methods = Object.clone(Methods), |
|
|
2573 | - tagName = element.tagName, property, value; | |
|
|
2569 | + tagName = element.tagName.toUpperCase(), property, value; | |
|
|
2574 | 2570 | |
|
|
2575 | 2571 | // extend methods for specific tags |
|
|
2576 | 2572 | if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]); |
| @@ -2666,7 +2662,7 | |||
|
|
2666 | 2662 | if (window[klass]) return window[klass]; |
|
|
2667 | 2663 | |
|
|
2668 | 2664 | window[klass] = { }; |
|
|
2669 |
- window[klass].prototype = document.createElement(tagName) |
|
|
|
2665 | + window[klass].prototype = document.createElement(tagName)['__proto__']; | |
|
|
2670 | 2666 | return window[klass]; |
|
|
2671 | 2667 | } |
|
|
2672 | 2668 | |
| @@ -2692,12 +2688,18 | |||
|
|
2692 | 2688 | |
|
|
2693 | 2689 | document.viewport = { |
|
|
2694 | 2690 | getDimensions: function() { |
|
|
2695 | - var dimensions = { }; | |
|
|
2696 | - var B = Prototype.Browser; | |
|
|
2691 | + var dimensions = { }, B = Prototype.Browser; | |
|
|
2697 | 2692 | $w('width height').each(function(d) { |
|
|
2698 | 2693 | var D = d.capitalize(); |
|
|
2699 |
- |
|
|
|
2700 | - (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D]; | |
|
|
2694 | + if (B.WebKit && !document.evaluate) { | |
|
|
2695 | + // Safari <3.0 needs self.innerWidth/Height | |
|
|
2696 | + dimensions[d] = self['inner' + D]; | |
|
|
2697 | + } else if (B.Opera && parseFloat(window.opera.version()) < 9.5) { | |
|
|
2698 | + // Opera <9.5 needs document.body.clientWidth/Height | |
|
|
2699 | + dimensions[d] = document.body['client' + D] | |
|
|
2700 | + } else { | |
|
|
2701 | + dimensions[d] = document.documentElement['client' + D]; | |
|
|
2702 | + } | |
|
|
2701 | 2703 | }); |
|
|
2702 | 2704 | return dimensions; |
|
|
2703 | 2705 | }, |
| @@ -2716,14 +2718,24 | |||
|
|
2716 | 2718 | window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop); |
|
|
2717 | 2719 | } |
|
|
2718 | 2720 | }; |
|
|
2719 |
- /* Portions of the Selector class are derived from Jack Slocum |
|
|
|
2721 | + /* Portions of the Selector class are derived from Jack Slocum's DomQuery, | |
|
|
2720 | 2722 | * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style |
|
|
2721 | 2723 | * license. Please see http://www.yui-ext.com/ for more information. */ |
|
|
2722 | 2724 | |
|
|
2723 | 2725 | var Selector = Class.create({ |
|
|
2724 | 2726 | initialize: function(expression) { |
|
|
2725 | 2727 | this.expression = expression.strip(); |
|
|
2726 | - this.compileMatcher(); | |
|
|
2728 | + | |
|
|
2729 | + if (this.shouldUseSelectorsAPI()) { | |
|
|
2730 | + this.mode = 'selectorsAPI'; | |
|
|
2731 | + } else if (this.shouldUseXPath()) { | |
|
|
2732 | + this.mode = 'xpath'; | |
|
|
2733 | + this.compileXPathMatcher(); | |
|
|
2734 | + } else { | |
|
|
2735 | + this.mode = "normal"; | |
|
|
2736 | + this.compileMatcher(); | |
|
|
2737 | + } | |
|
|
2738 | + | |
|
|
2727 | 2739 | }, |
|
|
2728 | 2740 | |
|
|
2729 | 2741 | shouldUseXPath: function() { |
| @@ -2738,16 +2750,29 | |||
|
|
2738 | 2750 | |
|
|
2739 | 2751 | // XPath can't do namespaced attributes, nor can it read |
|
|
2740 | 2752 | // the "checked" property from DOM nodes |
|
|
2741 |
- if ((/(\[[\w-]*?:|:checked)/).test( |
|
|
|
2753 | + if ((/(\[[\w-]*?:|:checked)/).test(e)) | |
|
|
2742 | 2754 | return false; |
|
|
2743 | 2755 | |
|
|
2744 | 2756 | return true; |
|
|
2745 | 2757 | }, |
|
|
2746 | 2758 | |
|
|
2759 | + shouldUseSelectorsAPI: function() { | |
|
|
2760 | + if (!Prototype.BrowserFeatures.SelectorsAPI) return false; | |
|
|
2761 | + | |
|
|
2762 | + if (!Selector._div) Selector._div = new Element('div'); | |
|
|
2763 | + | |
|
|
2764 | + // Make sure the browser treats the selector as valid. Test on an | |
|
|
2765 | + // isolated element to minimize cost of this check. | |
|
|
2766 | + try { | |
|
|
2767 | + Selector._div.querySelector(this.expression); | |
|
|
2768 | + } catch(e) { | |
|
|
2769 | + return false; | |
|
|
2770 | + } | |
|
|
2771 | + | |
|
|
2772 | + return true; | |
|
|
2773 | + }, | |
|
|
2774 | + | |
|
|
2747 | 2775 | compileMatcher: function() { |
|
|
2748 | - if (this.shouldUseXPath()) | |
|
|
2749 | - return this.compileXPathMatcher(); | |
|
|
2750 | - | |
|
|
2751 | 2776 | var e = this.expression, ps = Selector.patterns, h = Selector.handlers, |
|
|
2752 | 2777 | c = Selector.criteria, le, p, m; |
|
|
2753 | 2778 | |
| @@ -2765,7 +2790,7 | |||
|
|
2765 | 2790 | p = ps[i]; |
|
|
2766 | 2791 | if (m = e.match(p)) { |
|
|
2767 | 2792 | this.matcher.push(Object.isFunction(c[i]) ? c[i](m) : |
|
|
2768 |
- |
|
|
|
2793 | + new Template(c[i]).evaluate(m)); | |
|
|
2769 | 2794 | e = e.replace(m[0], ''); |
|
|
2770 | 2795 | break; |
|
|
2771 | 2796 | } |
| @@ -2804,8 +2829,27 | |||
|
|
2804 | 2829 | |
|
|
2805 | 2830 | findElements: function(root) { |
|
|
2806 | 2831 | root = root || document; |
|
|
2807 | - if (this.xpath) return document._getElementsByXPath(this.xpath, root); | |
|
|
2808 | - return this.matcher(root); | |
|
|
2832 | + var e = this.expression, results; | |
|
|
2833 | + | |
|
|
2834 | + switch (this.mode) { | |
|
|
2835 | + case 'selectorsAPI': | |
|
|
2836 | + // querySelectorAll queries document-wide, then filters to descendants | |
|
|
2837 | + // of the context element. That's not what we want. | |
|
|
2838 | + // Add an explicit context to the selector if necessary. | |
|
|
2839 | + if (root !== document) { | |
|
|
2840 | + var oldId = root.id, id = $(root).identify(); | |
|
|
2841 | + e = "#" + id + " " + e; | |
|
|
2842 | + } | |
|
|
2843 | + | |
|
|
2844 | + results = $A(root.querySelectorAll(e)).map(Element.extend); | |
|
|
2845 | + root.id = oldId; | |
|
|
2846 | + | |
|
|
2847 | + return results; | |
|
|
2848 | + case 'xpath': | |
|
|
2849 | + return document._getElementsByXPath(this.xpath, root); | |
|
|
2850 | + default: | |
|
|
2851 | + return this.matcher(root); | |
|
|
2852 | + } | |
|
|
2809 | 2853 | }, |
|
|
2810 | 2854 | |
|
|
2811 | 2855 | match: function(element) { |
| @@ -2896,10 +2940,10 | |||
|
|
2896 | 2940 | 'first-child': '[not(preceding-sibling::*)]', |
|
|
2897 | 2941 | 'last-child': '[not(following-sibling::*)]', |
|
|
2898 | 2942 | 'only-child': '[not(preceding-sibling::* or following-sibling::*)]', |
|
|
2899 |
- 'empty': "[count(*) = 0 and (count(text()) = 0 |
|
|
|
2943 | + 'empty': "[count(*) = 0 and (count(text()) = 0)]", | |
|
|
2900 | 2944 | 'checked': "[@checked]", |
|
|
2901 | - 'disabled': "[@disabled]", | |
|
|
2902 | - 'enabled': "[not(@disabled)]", | |
|
|
2945 | + 'disabled': "[(@disabled) and (@type!='hidden')]", | |
|
|
2946 | + 'enabled': "[not(@disabled) and (@type!='hidden')]", | |
|
|
2903 | 2947 | 'not': function(m) { |
|
|
2904 | 2948 | var e = m[6], p = Selector.patterns, |
|
|
2905 | 2949 | x = Selector.xpath, le, v; |
| @@ -2959,13 +3003,13 | |||
|
|
2959 | 3003 | }, |
|
|
2960 | 3004 | |
|
|
2961 | 3005 | criteria: { |
|
|
2962 | - tagName: 'n = h.tagName(n, r, "#{1}", c); c = false;', | |
|
|
2963 | - className: 'n = h.className(n, r, "#{1}", c); c = false;', | |
|
|
2964 | - id: 'n = h.id(n, r, "#{1}", c); c = false;', | |
|
|
2965 | - attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;', | |
|
|
3006 | + tagName: 'n = h.tagName(n, r, "#{1}", c); c = false;', | |
|
|
3007 | + className: 'n = h.className(n, r, "#{1}", c); c = false;', | |
|
|
3008 | + id: 'n = h.id(n, r, "#{1}", c); c = false;', | |
|
|
3009 | + attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;', | |
|
|
2966 | 3010 | attr: function(m) { |
|
|
2967 | 3011 | m[3] = (m[5] || m[6]); |
|
|
2968 | - return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m); | |
|
|
3012 | + return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m); | |
|
|
2969 | 3013 | }, |
|
|
2970 | 3014 | pseudo: function(m) { |
|
|
2971 | 3015 | if (m[6]) m[6] = m[6].replace(/"/g, '\\"'); |
| @@ -2989,8 +3033,9 | |||
|
|
2989 | 3033 | tagName: /^\s*(\*|[\w\-]+)(\b|$)?/, |
|
|
2990 | 3034 | id: /^#([\w\-\*]+)(\b|$)/, |
|
|
2991 | 3035 | className: /^\.([\w\-\*]+)(\b|$)/, |
|
|
2992 | - pseudo: /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s)|(?=:))/, | |
|
|
2993 | - attrPresence: /^\[([\w]+)\]/, | |
|
|
3036 | + pseudo: | |
|
|
3037 | + /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/, | |
|
|
3038 | + attrPresence: /^\[((?:[\w]+:)?[\w]+)\]/, | |
|
|
2994 | 3039 | attr: /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/ |
|
|
2995 | 3040 | }, |
|
|
2996 | 3041 | |
| @@ -3014,7 +3059,7 | |||
|
|
3014 | 3059 | |
|
|
3015 | 3060 | attr: function(element, matches) { |
|
|
3016 | 3061 | var nodeValue = Element.readAttribute(element, matches[1]); |
|
|
3017 |
- return Selector.operators[matches[2]](nodeValue, matches[ |
|
|
|
3062 | + return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]); | |
|
|
3018 | 3063 | } |
|
|
3019 | 3064 | }, |
|
|
3020 | 3065 | |
| @@ -3029,14 +3074,15 | |||
|
|
3029 | 3074 | |
|
|
3030 | 3075 | // marks an array of nodes for counting |
|
|
3031 | 3076 | mark: function(nodes) { |
|
|
3077 | + var _true = Prototype.emptyFunction; | |
|
|
3032 | 3078 | for (var i = 0, node; node = nodes[i]; i++) |
|
|
3033 | - node._counted = true; | |
|
|
3079 | + node._countedByPrototype = _true; | |
|
|
3034 | 3080 | return nodes; |
|
|
3035 | 3081 | }, |
|
|
3036 | 3082 | |
|
|
3037 | 3083 | unmark: function(nodes) { |
|
|
3038 | 3084 | for (var i = 0, node; node = nodes[i]; i++) |
|
|
3039 | - node._counted = undefined; | |
|
|
3085 | + node._countedByPrototype = undefined; | |
|
|
3040 | 3086 | return nodes; |
|
|
3041 | 3087 | }, |
|
|
3042 | 3088 | |
| @@ -3044,15 +3090,15 | |||
|
|
3044 | 3090 | // "ofType" flag indicates whether we're indexing for nth-of-type |
|
|
3045 | 3091 | // rather than nth-child |
|
|
3046 | 3092 | index: function(parentNode, reverse, ofType) { |
|
|
3047 |
- parentNode._counted = |
|
|
|
3093 | + parentNode._countedByPrototype = Prototype.emptyFunction; | |
|
|
3048 | 3094 | if (reverse) { |
|
|
3049 | 3095 | for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) { |
|
|
3050 | 3096 | var node = nodes[i]; |
|
|
3051 | - if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++; | |
|
|
3097 | + if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++; | |
|
|
3052 | 3098 | } |
|
|
3053 | 3099 | } else { |
|
|
3054 | 3100 | for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++) |
|
|
3055 | - if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++; | |
|
|
3101 | + if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++; | |
|
|
3056 | 3102 | } |
|
|
3057 | 3103 | }, |
|
|
3058 | 3104 | |
| @@ -3061,8 +3107,8 | |||
|
|
3061 | 3107 | if (nodes.length == 0) return nodes; |
|
|
3062 | 3108 | var results = [], n; |
|
|
3063 | 3109 | for (var i = 0, l = nodes.length; i < l; i++) |
|
|
3064 | - if (!(n = nodes[i])._counted) { | |
|
|
3065 |
- n._counted = |
|
|
|
3110 | + if (!(n = nodes[i])._countedByPrototype) { | |
|
|
3111 | + n._countedByPrototype = Prototype.emptyFunction; | |
|
|
3066 | 3112 | results.push(Element.extend(n)); |
|
|
3067 | 3113 | } |
|
|
3068 | 3114 | return Selector.handlers.unmark(results); |
| @@ -3102,7 +3148,7 | |||
|
|
3102 | 3148 | |
|
|
3103 | 3149 | nextElementSibling: function(node) { |
|
|
3104 | 3150 | while (node = node.nextSibling) |
|
|
3105 |
- |
|
|
|
3151 | + if (node.nodeType == 1) return node; | |
|
|
3106 | 3152 | return null; |
|
|
3107 | 3153 | }, |
|
|
3108 | 3154 | |
| @@ -3114,7 +3160,7 | |||
|
|
3114 | 3160 | |
|
|
3115 | 3161 | // TOKEN FUNCTIONS |
|
|
3116 | 3162 | tagName: function(nodes, root, tagName, combinator) { |
|
|
3117 |
- |
|
|
|
3163 | + var uTagName = tagName.toUpperCase(); | |
|
|
3118 | 3164 | var results = [], h = Selector.handlers; |
|
|
3119 | 3165 | if (nodes) { |
|
|
3120 | 3166 | if (combinator) { |
| @@ -3127,7 +3173,7 | |||
|
|
3127 | 3173 | if (tagName == "*") return nodes; |
|
|
3128 | 3174 | } |
|
|
3129 | 3175 | for (var i = 0, node; node = nodes[i]; i++) |
|
|
3130 |
- if (node.tagName.toUpperCase() == |
|
|
|
3176 | + if (node.tagName.toUpperCase() === uTagName) results.push(node); | |
|
|
3131 | 3177 | return results; |
|
|
3132 | 3178 | } else return root.getElementsByTagName(tagName); |
|
|
3133 | 3179 | }, |
| @@ -3174,16 +3220,18 | |||
|
|
3174 | 3220 | return results; |
|
|
3175 | 3221 | }, |
|
|
3176 | 3222 | |
|
|
3177 | - attrPresence: function(nodes, root, attr) { | |
|
|
3223 | + attrPresence: function(nodes, root, attr, combinator) { | |
|
|
3178 | 3224 | if (!nodes) nodes = root.getElementsByTagName("*"); |
|
|
3225 | + if (nodes && combinator) nodes = this[combinator](nodes); | |
|
|
3179 | 3226 | var results = []; |
|
|
3180 | 3227 | for (var i = 0, node; node = nodes[i]; i++) |
|
|
3181 | 3228 | if (Element.hasAttribute(node, attr)) results.push(node); |
|
|
3182 | 3229 | return results; |
|
|
3183 | 3230 | }, |
|
|
3184 | 3231 | |
|
|
3185 | - attr: function(nodes, root, attr, value, operator) { | |
|
|
3232 | + attr: function(nodes, root, attr, value, operator, combinator) { | |
|
|
3186 | 3233 | if (!nodes) nodes = root.getElementsByTagName("*"); |
|
|
3234 | + if (nodes && combinator) nodes = this[combinator](nodes); | |
|
|
3187 | 3235 | var handler = Selector.operators[operator], results = []; |
|
|
3188 | 3236 | for (var i = 0, node; node = nodes[i]; i++) { |
|
|
3189 | 3237 | var nodeValue = Element.readAttribute(node, attr); |
| @@ -3262,7 +3310,7 | |||
|
|
3262 | 3310 | var h = Selector.handlers, results = [], indexed = [], m; |
|
|
3263 | 3311 | h.mark(nodes); |
|
|
3264 | 3312 | for (var i = 0, node; node = nodes[i]; i++) { |
|
|
3265 | - if (!node.parentNode._counted) { | |
|
|
3313 | + if (!node.parentNode._countedByPrototype) { | |
|
|
3266 | 3314 | h.index(node.parentNode, reverse, ofType); |
|
|
3267 | 3315 | indexed.push(node.parentNode); |
|
|
3268 | 3316 | } |
| @@ -3289,7 +3337,7 | |||
|
|
3289 | 3337 | 'empty': function(nodes, value, root) { |
|
|
3290 | 3338 | for (var i = 0, results = [], node; node = nodes[i]; i++) { |
|
|
3291 | 3339 | // IE treats comments as element nodes |
|
|
3292 |
- if (node.tagName == '!' || |
|
|
|
3340 | + if (node.tagName == '!' || node.firstChild) continue; | |
|
|
3293 | 3341 | results.push(node); |
|
|
3294 | 3342 | } |
|
|
3295 | 3343 | return results; |
| @@ -3300,14 +3348,15 | |||
|
|
3300 | 3348 | var exclusions = new Selector(selector).findElements(root); |
|
|
3301 | 3349 | h.mark(exclusions); |
|
|
3302 | 3350 | for (var i = 0, results = [], node; node = nodes[i]; i++) |
|
|
3303 | - if (!node._counted) results.push(node); | |
|
|
3351 | + if (!node._countedByPrototype) results.push(node); | |
|
|
3304 | 3352 | h.unmark(exclusions); |
|
|
3305 | 3353 | return results; |
|
|
3306 | 3354 | }, |
|
|
3307 | 3355 | |
|
|
3308 | 3356 | 'enabled': function(nodes, value, root) { |
|
|
3309 | 3357 | for (var i = 0, results = [], node; node = nodes[i]; i++) |
|
|
3310 | - if (!node.disabled) results.push(node); | |
|
|
3358 | + if (!node.disabled && (!node.type || node.type !== 'hidden')) | |
|
|
3359 | + results.push(node); | |
|
|
3311 | 3360 | return results; |
|
|
3312 | 3361 | }, |
|
|
3313 | 3362 | |
| @@ -3327,18 +3376,29 | |||
|
|
3327 | 3376 | operators: { |
|
|
3328 | 3377 | '=': function(nv, v) { return nv == v; }, |
|
|
3329 | 3378 | '!=': function(nv, v) { return nv != v; }, |
|
|
3330 | - '^=': function(nv, v) { return nv.startsWith(v); }, | |
|
|
3379 | + '^=': function(nv, v) { return nv == v || nv && nv.startsWith(v); }, | |
|
|
3380 | + '$=': function(nv, v) { return nv == v || nv && nv.endsWith(v); }, | |
|
|
3381 | + '*=': function(nv, v) { return nv == v || nv && nv.include(v); }, | |
|
|
3331 | 3382 | '$=': function(nv, v) { return nv.endsWith(v); }, |
|
|
3332 | 3383 | '*=': function(nv, v) { return nv.include(v); }, |
|
|
3333 | 3384 | '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); }, |
|
|
3334 |
- '|=': function(nv, v) { return ('-' + nv.toUpperCase() + |
|
|
|
3385 | + '|=': function(nv, v) { return ('-' + (nv || "").toUpperCase() + | |
|
|
3386 | + '-').include('-' + (v || "").toUpperCase() + '-'); } | |
|
|
3387 | + }, | |
|
|
3388 | + | |
|
|
3389 | + split: function(expression) { | |
|
|
3390 | + var expressions = []; | |
|
|
3391 | + expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) { | |
|
|
3392 | + expressions.push(m[1].strip()); | |
|
|
3393 | + }); | |
|
|
3394 | + return expressions; | |
|
|
3335 | 3395 | }, |
|
|
3336 | 3396 | |
|
|
3337 | 3397 | matchElements: function(elements, expression) { |
|
|
3338 |
- var matches = |
|
|
|
3398 | + var matches = $$(expression), h = Selector.handlers; | |
|
|
3339 | 3399 | h.mark(matches); |
|
|
3340 | 3400 | for (var i = 0, results = [], element; element = elements[i]; i++) |
|
|
3341 | - if (element._counted) results.push(element); | |
|
|
3401 | + if (element._countedByPrototype) results.push(element); | |
|
|
3342 | 3402 | h.unmark(matches); |
|
|
3343 | 3403 | return results; |
|
|
3344 | 3404 | }, |
| @@ -3351,11 +3411,7 | |||
|
|
3351 | 3411 | }, |
|
|
3352 | 3412 | |
|
|
3353 | 3413 | findChildElements: function(element, expressions) { |
|
|
3354 |
- |
|
|
|
3355 | - expressions = []; | |
|
|
3356 | - exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) { | |
|
|
3357 | - expressions.push(m[1].strip()); | |
|
|
3358 | - }); | |
|
|
3414 | + expressions = Selector.split(expressions.join(',')); | |
|
|
3359 | 3415 | var results = [], h = Selector.handlers; |
|
|
3360 | 3416 | for (var i = 0, l = expressions.length, selector; i < l; i++) { |
|
|
3361 | 3417 | selector = new Selector(expressions[i].strip()); |
| @@ -3366,13 +3422,22 | |||
|
|
3366 | 3422 | }); |
|
|
3367 | 3423 | |
|
|
3368 | 3424 | if (Prototype.Browser.IE) { |
|
|
3369 | - // IE returns comment nodes on getElementsByTagName("*"). | |
|
|
3370 | - // Filter them out. | |
|
|
3371 | - Selector.handlers.concat = function(a, b) { | |
|
|
3372 | - for (var i = 0, node; node = b[i]; i++) | |
|
|
3373 | - if (node.tagName !== "!") a.push(node); | |
|
|
3374 | - return a; | |
|
|
3375 | - }; | |
|
|
3425 | + Object.extend(Selector.handlers, { | |
|
|
3426 | + // IE returns comment nodes on getElementsByTagName("*"). | |
|
|
3427 | + // Filter them out. | |
|
|
3428 | + concat: function(a, b) { | |
|
|
3429 | + for (var i = 0, node; node = b[i]; i++) | |
|
|
3430 | + if (node.tagName !== "!") a.push(node); | |
|
|
3431 | + return a; | |
|
|
3432 | + }, | |
|
|
3433 | + | |
|
|
3434 | + // IE improperly serializes _countedByPrototype in (inner|outer)HTML. | |
|
|
3435 | + unmark: function(nodes) { | |
|
|
3436 | + for (var i = 0, node; node = nodes[i]; i++) | |
|
|
3437 | + node.removeAttribute('_countedByPrototype'); | |
|
|
3438 | + return nodes; | |
|
|
3439 | + } | |
|
|
3440 | + }); | |
|
|
3376 | 3441 | } |
|
|
3377 | 3442 | |
|
|
3378 | 3443 | function $$() { |
| @@ -3392,7 +3457,7 | |||
|
|
3392 | 3457 | var data = elements.inject({ }, function(result, element) { |
|
|
3393 | 3458 | if (!element.disabled && element.name) { |
|
|
3394 | 3459 | key = element.name; value = $(element).getValue(); |
|
|
3395 | - if (value != null && (element.type != 'submit' || (!submitted && | |
|
|
3460 | + if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted && | |
|
|
3396 | 3461 | submit !== false && (!submit || key == submit) && (submitted = true)))) { |
|
|
3397 | 3462 | if (key in result) { |
|
|
3398 | 3463 | // a key is already present; construct an array of values |
| @@ -3553,7 +3618,6 | |||
|
|
3553 | 3618 | |
|
|
3554 | 3619 | disable: function(element) { |
|
|
3555 | 3620 | element = $(element); |
|
|
3556 | - element.blur(); | |
|
|
3557 | 3621 | element.disabled = true; |
|
|
3558 | 3622 | return element; |
|
|
3559 | 3623 | }, |
| @@ -3593,22 +3657,22 | |||
|
|
3593 | 3657 | else element.value = value; |
|
|
3594 | 3658 | }, |
|
|
3595 | 3659 | |
|
|
3596 |
- select: function(element, |
|
|
|
3597 |
- if (Object.isUndefined( |
|
|
|
3660 | + select: function(element, value) { | |
|
|
3661 | + if (Object.isUndefined(value)) | |
|
|
3598 | 3662 | return this[element.type == 'select-one' ? |
|
|
3599 | 3663 | 'selectOne' : 'selectMany'](element); |
|
|
3600 | 3664 | else { |
|
|
3601 |
- var opt, |
|
|
|
3665 | + var opt, currentValue, single = !Object.isArray(value); | |
|
|
3602 | 3666 | for (var i = 0, length = element.length; i < length; i++) { |
|
|
3603 | 3667 | opt = element.options[i]; |
|
|
3604 |
- |
|
|
|
3668 | + currentValue = this.optionValue(opt); | |
|
|
3605 | 3669 | if (single) { |
|
|
3606 |
- if ( |
|
|
|
3670 | + if (currentValue == value) { | |
|
|
3607 | 3671 | opt.selected = true; |
|
|
3608 | 3672 | return; |
|
|
3609 | 3673 | } |
|
|
3610 | 3674 | } |
|
|
3611 |
- else opt.selected = |
|
|
|
3675 | + else opt.selected = value.include(currentValue); | |
|
|
3612 | 3676 | } |
|
|
3613 | 3677 | } |
|
|
3614 | 3678 | }, |
| @@ -3779,8 +3843,23 | |||
|
|
3779 | 3843 | isRightClick: function(event) { return isButton(event, 2) }, |
|
|
3780 | 3844 | |
|
|
3781 | 3845 | element: function(event) { |
|
|
3782 |
- |
|
|
|
3783 | - return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node); | |
|
|
3846 | + event = Event.extend(event); | |
|
|
3847 | + | |
|
|
3848 | + var node = event.target, | |
|
|
3849 | + type = event.type, | |
|
|
3850 | + currentTarget = event.currentTarget; | |
|
|
3851 | + | |
|
|
3852 | + if (currentTarget && currentTarget.tagName) { | |
|
|
3853 | + // Firefox screws up the "click" event when moving between radio buttons | |
|
|
3854 | + // via arrow keys. It also screws up the "load" and "error" events on images, | |
|
|
3855 | + // reporting the document as the target instead of the original image. | |
|
|
3856 | + if (type === 'load' || type === 'error' || | |
|
|
3857 | + (type === 'click' && currentTarget.tagName.toLowerCase() === 'input' | |
|
|
3858 | + && currentTarget.type === 'radio')) | |
|
|
3859 | + node = currentTarget; | |
|
|
3860 | + } | |
|
|
3861 | + if (node.nodeType == Node.TEXT_NODE) node = node.parentNode; | |
|
|
3862 | + return Element.extend(node); | |
|
|
3784 | 3863 | }, |
|
|
3785 | 3864 | |
|
|
3786 | 3865 | findElement: function(event, expression) { |
| @@ -3791,11 +3870,15 | |||
|
|
3791 | 3870 | }, |
|
|
3792 | 3871 | |
|
|
3793 | 3872 | pointer: function(event) { |
|
|
3873 | + var docElement = document.documentElement, | |
|
|
3874 | + body = document.body || { scrollLeft: 0, scrollTop: 0 }; | |
|
|
3794 | 3875 | return { |
|
|
3795 | 3876 | x: event.pageX || (event.clientX + |
|
|
3796 |
- (doc |
|
|
|
3877 | + (docElement.scrollLeft || body.scrollLeft) - | |
|
|
3878 | + (docElement.clientLeft || 0)), | |
|
|
3797 | 3879 | y: event.pageY || (event.clientY + |
|
|
3798 |
- (doc |
|
|
|
3880 | + (docElement.scrollTop || body.scrollTop) - | |
|
|
3881 | + (docElement.clientTop || 0)) | |
|
|
3799 | 3882 | }; |
|
|
3800 | 3883 | }, |
|
|
3801 | 3884 | |
| @@ -3840,7 +3923,7 | |||
|
|
3840 | 3923 | }; |
|
|
3841 | 3924 | |
|
|
3842 | 3925 | } else { |
|
|
3843 |
- Event.prototype = Event.prototype || document.createEvent("HTMLEvents") |
|
|
|
3926 | + Event.prototype = Event.prototype || document.createEvent("HTMLEvents")['__proto__']; | |
|
|
3844 | 3927 | Object.extend(Event.prototype, methods); |
|
|
3845 | 3928 | return Prototype.K; |
|
|
3846 | 3929 | } |
| @@ -3850,9 +3933,9 | |||
|
|
3850 | 3933 | var cache = Event.cache; |
|
|
3851 | 3934 | |
|
|
3852 | 3935 | function getEventID(element) { |
|
|
3853 | - if (element._eventID) return element._eventID; | |
|
|
3936 | + if (element._prototypeEventID) return element._prototypeEventID[0]; | |
|
|
3854 | 3937 | arguments.callee.id = arguments.callee.id || 1; |
|
|
3855 | - return element._eventID = ++arguments.callee.id; | |
|
|
3938 | + return element._prototypeEventID = [++arguments.callee.id]; | |
|
|
3856 | 3939 | } |
|
|
3857 | 3940 | |
|
|
3858 | 3941 | function getDOMEventName(eventName) { |
| @@ -3880,7 +3963,7 | |||
|
|
3880 | 3963 | return false; |
|
|
3881 | 3964 | |
|
|
3882 | 3965 | Event.extend(event); |
|
|
3883 | - handler.call(element, event) | |
|
|
3966 | + handler.call(element, event); | |
|
|
3884 | 3967 | }; |
|
|
3885 | 3968 | |
|
|
3886 | 3969 | wrapper.handler = handler; |
| @@ -3905,10 +3988,20 | |||
|
|
3905 | 3988 | cache[id][eventName] = null; |
|
|
3906 | 3989 | } |
|
|
3907 | 3990 | |
|
|
3991 | + | |
|
|
3992 | + // Internet Explorer needs to remove event handlers on page unload | |
|
|
3993 | + // in order to avoid memory leaks. | |
|
|
3908 | 3994 | if (window.attachEvent) { |
|
|
3909 | 3995 | window.attachEvent("onunload", destroyCache); |
|
|
3910 | 3996 | } |
|
|
3911 | 3997 | |
|
|
3998 | + // Safari has a dummy event handler on page unload so that it won't | |
|
|
3999 | + // use its bfcache. Safari <= 3.1 has an issue with restoring the "document" | |
|
|
4000 | + // object when page is returned to via the back button using its bfcache. | |
|
|
4001 | + if (Prototype.Browser.WebKit) { | |
|
|
4002 | + window.addEventListener('unload', Prototype.emptyFunction, false); | |
|
|
4003 | + } | |
|
|
4004 | + | |
|
|
3912 | 4005 | return { |
|
|
3913 | 4006 | observe: function(element, eventName, handler) { |
|
|
3914 | 4007 | element = $(element); |
| @@ -3962,11 +4055,12 | |||
|
|
3962 | 4055 | if (element == document && document.createEvent && !element.dispatchEvent) |
|
|
3963 | 4056 | element = document.documentElement; |
|
|
3964 | 4057 | |
|
|
4058 | + var event; | |
|
|
3965 | 4059 | if (document.createEvent) { |
|
|
3966 |
- |
|
|
|
4060 | + event = document.createEvent("HTMLEvents"); | |
|
|
3967 | 4061 | event.initEvent("dataavailable", true, true); |
|
|
3968 | 4062 | } else { |
|
|
3969 |
- |
|
|
|
4063 | + event = document.createEventObject(); | |
|
|
3970 | 4064 | event.eventType = "ondataavailable"; |
|
|
3971 | 4065 | } |
|
|
3972 | 4066 | |
| @@ -3995,20 +4089,21 | |||
|
|
3995 | 4089 | Object.extend(document, { |
|
|
3996 | 4090 | fire: Element.Methods.fire.methodize(), |
|
|
3997 | 4091 | observe: Element.Methods.observe.methodize(), |
|
|
3998 | - stopObserving: Element.Methods.stopObserving.methodize() | |
|
|
4092 | + stopObserving: Element.Methods.stopObserving.methodize(), | |
|
|
4093 | + loaded: false | |
|
|
3999 | 4094 | }); |
|
|
4000 | 4095 | |
|
|
4001 | 4096 | (function() { |
|
|
4002 | 4097 | /* Support for the DOMContentLoaded event is based on work by Dan Webb, |
|
|
4003 | 4098 | Matthias Miller, Dean Edwards and John Resig. */ |
|
|
4004 | 4099 | |
|
|
4005 |
- var timer |
|
|
|
4100 | + var timer; | |
|
|
4006 | 4101 | |
|
|
4007 | 4102 | function fireContentLoadedEvent() { |
|
|
4008 |
- if ( |
|
|
|
4103 | + if (document.loaded) return; | |
|
|
4009 | 4104 | if (timer) window.clearInterval(timer); |
|
|
4010 | 4105 | document.fire("dom:loaded"); |
|
|
4011 |
- |
|
|
|
4106 | + document.loaded = true; | |
|
|
4012 | 4107 | } |
|
|
4013 | 4108 | |
|
|
4014 | 4109 | if (document.addEventListener) { |
You need to be logged in to leave comments.
Login now