cafe-grader-web Commit - r163:74e3afe899a3

cafe-grader-web

Commit `r163:74e3afe899a3` public

parent | child

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:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r163:74e3afe899a3 - Sun, 12 Apr 2009 15:34:49 - 5 files changed: 433 inserted, 328 deleted

config/boot.rb ¶ +3 -2

               # Don't change this file!
               # Configure your app in config/environment.rb and config/environments/*.rb
               RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
               module Rails
                 class << self
                   def boot!
                     unless booted?
                       preinitialize
                       pick_boot.run
                     end
                   end
                   def booted?
                     defined? Rails::Initializer
                   end
                   def pick_boot
                     (vendor_rails? ? VendorBoot : GemBoot).new
                   end
                   def vendor_rails?
                     File.exist?("#{RAILS_ROOT}/vendor/rails")
                   end
                   def preinitialize
                     load(preinitializer_path) if File.exist?(preinitializer_path)
                   end
                   def preinitializer_path
                     "#{RAILS_ROOT}/config/preinitializer.rb"
                   end
                 end
                 class Boot
                   def run
                     load_initializer
                     Rails::Initializer.run(:set_load_path)
                   end
                 end
                 class VendorBoot < Boot
                   def load_initializer
                     require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
                     Rails::Initializer.run(:install_gem_spec_stubs)
+            +       Rails::GemDependency.add_frozen_gem_path
                   end
                 end
                 class GemBoot < Boot
                   def load_initializer
                     self.class.load_rubygems
                     load_rails_gem
                     require 'initializer'
                   end
                   def load_rails_gem
                     if version = self.class.gem_version
                       gem 'rails', version
                     else
                       gem 'rails'
                     end
                   rescue Gem::LoadError => load_error
                     $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
                     exit 1
                   end
                   class << self
                     def rubygems_version
-            -         Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+            +         Gem::RubyGemsVersion rescue nil
                     end
                     def gem_version
                       if defined? RAILS_GEM_VERSION
                         RAILS_GEM_VERSION
                       elsif ENV.include?('RAILS_GEM_VERSION')
                         ENV['RAILS_GEM_VERSION']
                       else
                         parse_gem_version(read_environment_rb)
                       end
                     end
                     def load_rubygems
                       require 'rubygems'
-            -         min_version = '1.1.1'
+            +         min_version = '1.3.1'
                       unless rubygems_version >= min_version
                         $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
                         exit 1
                       end
                     rescue LoadError
                       $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
                       exit 1
                     end
                     def parse_gem_version(text)
                       $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
                     end
                     private
                       def read_environment_rb
                         File.read("#{RAILS_ROOT}/config/environment.rb")
                       end
                   end
                 end
               end
               # All that for this:
               Rails.boot!

public/javascripts/controls.js ¶ +11 -11

               // Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-            - //           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+            + //           (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-            - //           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+            + //           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
               // Contributors:
               //  Richard Livsey
               //  Rahul Bhargava
               //  Rob Wills
               //
               // script.aculo.us is freely distributable under the terms of an MIT-style license.
               // For details, see the script.aculo.us web site: http://script.aculo.us/
               // Autocompleter.Base handles all the autocompletion functionality
               // that's independent of the data source for autocompletion. This
               // includes drawing the autocompletion menu, observing keyboard
               // and mouse events, and similar.
               //
               // Specific autocompleters need to provide, at the very least,
               // a getUpdatedChoices function that will be invoked every time
               // the text inside the monitored textbox changes. This method
               // should get the text for which to provide autocompletion by
               // invoking this.getToken(), NOT by directly accessing
               // this.element.value. This is to allow incremental tokenized
               // autocompletion. Specific auto-completion logic (AJAX, etc)
               // belongs in getUpdatedChoices.
               //
               // Tokenized incremental autocompletion is enabled automatically
               // when an autocompleter is instantiated with the 'tokens' option
               // in the options parameter, e.g.:
               // new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
               // will incrementally autocomplete with a comma as the token.
               // Additionally, ',' in the above example can be replaced with
               // a token array, e.g. { tokens: [',', '\n'] } which
               // enables autocompletion on multiple tokens. This is most
               // useful when one of the tokens is \n (a newline), as it
               // allows smart autocompletion after linebreaks.
               if(typeof Effect == 'undefined')
                 throw("controls.js requires including script.aculo.us' effects.js library");
-            - var Autocompleter = { }
+            + var Autocompleter = { };
               Autocompleter.Base = Class.create({
                 baseInitialize: function(element, update, options) {
-            -     element          = $(element)
+            +     element          = $(element);
                   this.element     = element;
                   this.update      = $(update);
                   this.hasFocus    = false;
                   this.changed     = false;
                   this.active      = false;
                   this.index       = 0;
                   this.entryCount  = 0;
                   this.oldElementValue = this.element.value;
                   if(this.setOptions)
                     this.setOptions(options);
                   else
                     this.options = options || { };
                   this.options.paramName    = this.options.paramName || this.element.name;
                   this.options.tokens       = this.options.tokens || [];
                   this.options.frequency    = this.options.frequency || 0.4;
                   this.options.minChars     = this.options.minChars || 1;
                   this.options.onShow       = this.options.onShow ||
                     function(element, update){
                       if(!update.style.position || update.style.position=='absolute') {
                         update.style.position = 'absolute';
                         Position.clone(element, update, {
                           setHeight: false,
                           offsetTop: element.offsetHeight
                         });
                       }
                       Effect.Appear(update,{duration:0.15});
                     };
                   this.options.onHide = this.options.onHide ||
                     function(element, update){ new Effect.Fade(update,{duration:0.15}) };
                   if(typeof(this.options.tokens) == 'string')
                     this.options.tokens = new Array(this.options.tokens);
                   // Force carriage returns as token delimiters anyway
                   if (!this.options.tokens.include('\n'))
                     this.options.tokens.push('\n');
                   this.observer = null;
                   this.element.setAttribute('autocomplete','off');
                   Element.hide(this.update);
                   Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
                   Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
                 },
                 activate: function() {
                   this.changed = false;
                   this.hasFocus = true;
                   this.getUpdatedChoices();
                 },
                 onHover: function(event) {
                   var element = Event.findElement(event, 'LI');
                   if(this.index != element.autocompleteIndex)
                   {
                       this.index = element.autocompleteIndex;
                       this.render();
                   }
                   Event.stop(event);
                 },
                 onClick: function(event) {
                   var element = Event.findElement(event, 'LI');
                   this.index = element.autocompleteIndex;
                   this.selectEntry();
                   this.hide();
                 },
                 onBlur: function(event) {
                   // needed to make click events working
                   setTimeout(this.hide.bind(this), 250);
                   this.hasFocus = false;
                   this.active = false;
                 },
                 render: function() {
                   if(this.entryCount > 0) {
                     for (var i = 0; i < this.entryCount; i++)
                       this.index==i ?
                         Element.addClassName(this.getEntry(i),"selected") :
                         Element.removeClassName(this.getEntry(i),"selected");
                     if(this.hasFocus) {
                       this.show();
                       this.active = true;
                     }
                   } else {
                     this.active = false;
                     this.hide();
                   }
                 },
                 markPrevious: function() {
-            -     if(this.index > 0) this.index--
+            +     if(this.index > 0) this.index--;
                     else this.index = this.entryCount-1;
                   this.getEntry(this.index).scrollIntoView(true);
                 },
                 markNext: function() {
-            -     if(this.index < this.entryCount-1) this.index++
+            +     if(this.index < this.entryCount-1) this.index++;
                     else this.index = 0;
                   this.getEntry(this.index).scrollIntoView(false);
                 },
                 getEntry: function(index) {
                   return this.update.firstChild.childNodes[index];
                 },
                 getCurrentEntry: function() {
                   return this.getEntry(this.index);
                 },
                 selectEntry: function() {
                   this.active = false;
                   this.updateElement(this.getCurrentEntry());
                 },
                 updateElement: function(selectedElement) {
                   if (this.options.updateElement) {
                     this.options.updateElement(selectedElement);
                     return;
                   }
                   var value = '';
                   if (this.options.select) {
                     var nodes = $(selectedElement).select('.' + this.options.select) || [];
                     if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
                   } else
                     value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
                   var bounds = this.getTokenBounds();
                   if (bounds[0] != -1) {
                     var newValue = this.element.value.substr(0, bounds[0]);
                     var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
                     if (whitespace)
                       newValue += whitespace[0];
                     this.element.value = newValue + value + this.element.value.substr(bounds[1]);
                   } else {
                     this.element.value = value;
                   }
                   this.oldElementValue = this.element.value;
                   this.element.focus();
                   if (this.options.afterUpdateElement)
                     this.options.afterUpdateElement(this.element, selectedElement);
                 },
                 updateChoices: function(choices) {
                   if(!this.changed && this.hasFocus) {
                 getUpdatedChoices: function() {
                   this.updateChoices(this.options.selector(this));
                 },
                 setOptions: function(options) {
                   this.options = Object.extend({
                     choices: 10,
                     partialSearch: true,
                     partialChars: 2,
                     ignoreCase: true,
                     fullSearch: false,
                     selector: function(instance) {
                       var ret       = []; // Beginning matches
                       var partial   = []; // Inside matches
                       var entry     = instance.getToken();
                       var count     = 0;
                       for (var i = 0; i < instance.options.array.length &&
                         ret.length < instance.options.choices ; i++) {
                         var elem = instance.options.array[i];
                         var foundPos = instance.options.ignoreCase ?
                           elem.toLowerCase().indexOf(entry.toLowerCase()) :
                           elem.indexOf(entry);
                         while (foundPos != -1) {
                           if (foundPos == 0 && elem.length != entry.length) {
                             ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
                               elem.substr(entry.length) + "</li>");
                             break;
                           } else if (entry.length >= instance.options.partialChars &&
                             instance.options.partialSearch && foundPos != -1) {
                             if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
                               partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
                                 elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
                                 foundPos + entry.length) + "</li>");
                               break;
                             }
                           }
                           foundPos = instance.options.ignoreCase ?
                             elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
                             elem.indexOf(entry, foundPos + 1);
                         }
                       }
                       if (partial.length)
-            -           ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
+            +           ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
                       return "<ul>" + ret.join('') + "</ul>";
                     }
                   }, options || { });
                 }
               });
               // AJAX in-place editor and collection editor
               // Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
               // Use this if you notice weird scrolling problems on some browsers,
               // the DOM might be a bit confused when this gets called so do this
               // waits 1 ms (with setTimeout) until it does the activation
               Field.scrollFreeActivate = function(field) {
                 setTimeout(function() {
                   Field.activate(field);
                 }, 1);
-            - }
+            + };
               Ajax.InPlaceEditor = Class.create({
                 initialize: function(element, url, options) {
                   this.url = url;
                   this.element = element = $(element);
                   this.prepareOptions();
                   this._controls = { };
                   arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
                   Object.extend(this.options, options || { });
                   if (!this.options.formId && this.element.id) {
                     this.options.formId = this.element.id + '-inplaceeditor';
                     if ($(this.options.formId))
                       this.options.formId = '';
                   }
                   if (this.options.externalControl)
                     this.options.externalControl = $(this.options.externalControl);
                   if (!this.options.externalControl)
                     this.options.externalControlOnly = false;
                   this._originalBackground = this.element.getStyle('background-color') || 'transparent';
                   this.element.title = this.options.clickToEditText;
                   this._boundCancelHandler = this.handleFormCancellation.bind(this);
                   this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
                   this._boundFailureHandler = this.handleAJAXFailure.bind(this);
                   this._boundSubmitHandler = this.handleFormSubmission.bind(this);
                   this._boundWrapperHandler = this.wrapUp.bind(this);
                   this.registerListeners();
                 },
                 checkForEscapeOrReturn: function(e) {
                   if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
                   if (Event.KEY_ESC == e.keyCode)
                     this.handleFormCancellation(e);
                   else if (Event.KEY_RETURN == e.keyCode)
                     this.handleFormSubmission(e);
                 },
                 createControl: function(mode, handler, extraClasses) {
                   var control = this.options[mode + 'Control'];
                   var text = this.options[mode + 'Text'];
                   if ('button' == control) {
                     var btn = document.createElement('input');
                     btn.type = 'submit';
                     btn.value = text;
                     btn.className = 'editor_' + mode + '_button';
                     if ('cancel' == mode)
                       btn.onclick = this._boundCancelHandler;
                     this._form.appendChild(btn);
                     this._controls[mode] = btn;
                   } else if ('link' == control) {
                     var link = document.createElement('a');
                 createForm: function() {
                   var ipe = this;
                   function addText(mode, condition) {
                     var text = ipe.options['text' + mode + 'Controls'];
                     if (!text || condition === false) return;
                     ipe._form.appendChild(document.createTextNode(text));
                   };
                   this._form = $(document.createElement('form'));
                   this._form.id = this.options.formId;
                   this._form.addClassName(this.options.formClassName);
                   this._form.onsubmit = this._boundSubmitHandler;
                   this.createEditField();
                   if ('textarea' == this._controls.editor.tagName.toLowerCase())
                     this._form.appendChild(document.createElement('br'));
                   if (this.options.onFormCustomization)
                     this.options.onFormCustomization(this, this._form);
                   addText('Before', this.options.okControl || this.options.cancelControl);
                   this.createControl('ok', this._boundSubmitHandler);
                   addText('Between', this.options.okControl && this.options.cancelControl);
                   this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
                   addText('After', this.options.okControl || this.options.cancelControl);
                 },
                 destroy: function() {
                   if (this._oldInnerHTML)
                     this.element.innerHTML = this._oldInnerHTML;
                   this.leaveEditMode();
                   this.unregisterListeners();
                 },
                 enterEditMode: function(e) {
                   if (this._saving || this._editing) return;
                   this._editing = true;
                   this.triggerCallback('onEnterEditMode');
                   if (this.options.externalControl)
                     this.options.externalControl.hide();
                   this.element.hide();
                   this.createForm();
                   this.element.parentNode.insertBefore(this._form, this.element);
                   if (!this.options.loadTextURL)
                     this.postProcessEditField();
                   if (e) Event.stop(e);
                 },
                 enterHover: function(e) {
                   if (this.options.hoverClassName)
                     this.element.addClassName(this.options.hoverClassName);
                   if (this._saving) return;
                   this.triggerCallback('onEnterHover');
                 },
                 getText: function() {
-            -     return this.element.innerHTML;
+            +     return this.element.innerHTML.unescapeHTML();
                 },
                 handleAJAXFailure: function(transport) {
                   this.triggerCallback('onFailure', transport);
                   if (this._oldInnerHTML) {
                     this.element.innerHTML = this._oldInnerHTML;
                     this._oldInnerHTML = null;
                   }
                 },
                 handleFormCancellation: function(e) {
                   this.wrapUp();
                   if (e) Event.stop(e);
                 },
                 handleFormSubmission: function(e) {
                   var form = this._form;
                   var value = $F(this._controls.editor);
                   this.prepareSubmission();
                   var params = this.options.callback(form, value) || '';
                   if (Object.isString(params))
                     params = params.toQueryParams();
                   params.editorId = this.element.id;
                   if (this.options.htmlResponse) {
                     var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
                     Object.extend(options, {
                       parameters: params,
                       onComplete: this._boundWrapperHandler,
                       onFailure: this._boundFailureHandler
                     });
                     new Ajax.Updater({ success: this.element }, this.url, options);
                   } else {
                     var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
                     Object.extend(options, {
                       parameters: params,
                       onComplete: this._boundWrapperHandler,
                       onFailure: this._boundFailureHandler
                     });
                     new Ajax.Request(this.url, options);
                   }
                   if (e) Event.stop(e);
                 },
                 leaveEditMode: function() {
                   this.element.removeClassName(this.options.savingClassName);
                   this.removeForm();
                   this.leaveHover();
                   this.element.style.backgroundColor = this._originalBackground;
                   this.element.show();
                   if (this.options.externalControl)
                     this.options.externalControl.show();
                   this._saving = false;
                   $H(this._listeners).each(function(pair) {
                     if (!this.options.externalControlOnly)
                       this.element.stopObserving(pair.key, pair.value);
                     if (this.options.externalControl)
                       this.options.externalControl.stopObserving(pair.key, pair.value);
                   }.bind(this));
                 },
                 wrapUp: function(transport) {
                   this.leaveEditMode();
                   // Can't use triggerCallback due to backward compatibility: requires
                   // binding + direct element
                   this._boundComplete(transport, this.element);
                 }
               });
               Object.extend(Ajax.InPlaceEditor.prototype, {
                 dispose: Ajax.InPlaceEditor.prototype.destroy
               });
               Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
                 initialize: function($super, element, url, options) {
                   this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
                   $super(element, url, options);
                 },
                 createEditField: function() {
                   var list = document.createElement('select');
                   list.name = this.options.paramName;
                   list.size = 1;
                   this._controls.editor = list;
                   this._collection = this.options.collection || [];
                   if (this.options.loadCollectionURL)
                     this.loadCollection();
                   else
                     this.checkForExternalText();
                   this._form.appendChild(this._controls.editor);
                 },
                 loadCollection: function() {
                   this._form.addClassName(this.options.loadingClassName);
                   this.showLoadingText(this.options.loadingCollectionText);
                   var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
                   Object.extend(options, {
                     parameters: 'editorId=' + encodeURIComponent(this.element.id),
                     onComplete: Prototype.emptyFunction,
                     onSuccess: function(transport) {
                       var js = transport.responseText.strip();
                       if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
-            -           throw 'Server returned an invalid collection representation.';
+            +           throw('Server returned an invalid collection representation.');
                       this._collection = eval(js);
                       this.checkForExternalText();
                     }.bind(this),
                     onFailure: this.onFailure
                   });
                   new Ajax.Request(this.options.loadCollectionURL, options);
                 },
                 showLoadingText: function(text) {
                   this._controls.editor.disabled = true;
                   var tempOption = this._controls.editor.firstChild;
                   if (!tempOption) {
                     tempOption = document.createElement('option');
                     tempOption.value = '';
                     this._controls.editor.appendChild(tempOption);
                     tempOption.selected = true;
                   }
                   tempOption.update((text || '').stripScripts().stripTags());
                 },
                 checkForExternalText: function() {
                   this._text = this.getText();
                   if (this.options.loadTextURL)
                     this.loadExternalText();
                   else
                     this.buildOptionList();
                 },
                 loadExternalText: function() {
                   this.showLoadingText(this.options.loadingText);
                   var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
                   Object.extend(options, {
                     parameters: 'editorId=' + encodeURIComponent(this.element.id),
                     onComplete: Prototype.emptyFunction,
                     onSuccess: function(transport) {
                       this._text = transport.responseText.strip();
                       this.buildOptionList();
                     }.bind(this),
                     onFailure: this.onFailure
                   });
                   new Ajax.Request(this.options.loadTextURL, options);
                 },
                 buildOptionList: function() {
                   this._form.removeClassName(this.options.loadingClassName);
                   this._collection = this._collection.map(function(entry) {
                     return 2 === entry.length ? entry : [entry, entry].flatten();
                   });
                   },
                   onFailure: function(transport, ipe) {
                     alert('Error communication with the server: ' + transport.responseText.stripTags());
                   },
                   onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
                   onLeaveEditMode: null,
                   onLeaveHover: function(ipe) {
                     ipe._effect = new Effect.Highlight(ipe.element, {
                       startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
                       restorecolor: ipe._originalBackground, keepBackgroundImage: true
                     });
                   }
                 },
                 Listeners: {
                   click: 'enterEditMode',
                   keydown: 'checkForEscapeOrReturn',
                   mouseover: 'enterHover',
                   mouseout: 'leaveHover'
                 }
               });
               Ajax.InPlaceCollectionEditor.DefaultOptions = {
                 loadingCollectionText: 'Loading options...'
               };
               // Delayed observer, like Form.Element.Observer,
               // but waits for delay after last key input
               // Ideal for live-search fields
               Form.Element.DelayedObserver = Class.create({
                 initialize: function(element, delay, callback) {
                   this.delay     = delay || 0.5;
                   this.element   = $(element);
                   this.callback  = callback;
                   this.timer     = null;
                   this.lastValue = $F(this.element);
                   Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
                 },
                 delayedListener: function(event) {
                   if(this.lastValue == $F(this.element)) return;
                   if(this.timer) clearTimeout(this.timer);
                   this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
                   this.lastValue = $F(this.element);
                 },
                 onTimerEvent: function() {
                   this.timer = null;
                   this.callback(this.element, $F(this.element));
                 }
-            - });
+            + });
  No newline at end of file

public/javascripts/dragdrop.js ¶ +21 -20

               // Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-            - //           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+            + //           (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
               //
               // script.aculo.us is freely distributable under the terms of an MIT-style license.
               // For details, see the script.aculo.us web site: http://script.aculo.us/
               if(Object.isUndefined(Effect))
                 throw("dragdrop.js requires including script.aculo.us' effects.js library");
               var Droppables = {
                 drops: [],
                 remove: function(element) {
                   this.drops = this.drops.reject(function(d) { return d.element==$(element) });
                 },
                 add: function(element) {
                   element = $(element);
                   var options = Object.extend({
                     greedy:     true,
                     hoverclass: null,
                     tree:       false
                   }, arguments[1] || { });
                   // cache containers
                   if(options.containment) {
                     options._containers = [];
                     var containment = options.containment;
                     if(Object.isArray(containment)) {
                       containment.each( function(c) { options._containers.push($(c)) });
                     } else {
                       options._containers.push($(containment));
                     }
                   }
                   if(options.accept) options.accept = [options.accept].flatten();
                   Element.makePositioned(element); // fix IE
                   options.element = element;
                   this.drops.push(options);
                 },
                 findDeepestChild: function(drops) {
                   deepest = drops[0];
                   for (i = 1; i < drops.length; ++i)
                     if (Element.isParent(drops[i].element, deepest.element))
                       deepest = drops[i];
                   if(drop.hoverclass)
                     Element.removeClassName(drop.element, drop.hoverclass);
                   this.last_active = null;
                 },
                 activate: function(drop) {
                   if(drop.hoverclass)
                     Element.addClassName(drop.element, drop.hoverclass);
                   this.last_active = drop;
                 },
                 show: function(point, element) {
                   if(!this.drops.length) return;
                   var drop, affected = [];
                   this.drops.each( function(drop) {
                     if(Droppables.isAffected(point, element, drop))
                       affected.push(drop);
                   });
                   if(affected.length>0)
                     drop = Droppables.findDeepestChild(affected);
                   if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
                   if (drop) {
                     Position.within(drop.element, point[0], point[1]);
                     if(drop.onHover)
                       drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
                     if (drop != this.last_active) Droppables.activate(drop);
                   }
                 },
                 fire: function(event, element) {
                   if(!this.last_active) return;
                   Position.prepare();
                   if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
                     if (this.last_active.onDrop) {
                       this.last_active.onDrop(element, this.last_active.element, event);
                       return true;
                     }
                 },
                 reset: function() {
                   if(this.last_active)
                     this.deactivate(this.last_active);
                 }
-            - }
+            + };
               var Draggables = {
                 drags: [],
                 observers: [],
                 register: function(draggable) {
                   if(this.drags.length == 0) {
                     this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
                     this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
                     this.eventKeypress  = this.keyPress.bindAsEventListener(this);
                     Event.observe(document, "mouseup", this.eventMouseUp);
                     Event.observe(document, "mousemove", this.eventMouseMove);
                     Event.observe(document, "keypress", this.eventKeypress);
                   }
                   this.drags.push(draggable);
                 },
                 unregister: function(draggable) {
                   this.drags = this.drags.reject(function(d) { return d==draggable });
                   if(this.drags.length == 0) {
                     Event.stopObserving(document, "mouseup", this.eventMouseUp);
                     Event.stopObserving(document, "mousemove", this.eventMouseMove);
                     Event.stopObserving(document, "keypress", this.eventKeypress);
                   }
                 },
                 activate: function(draggable) {
                   if(draggable.options.delay) {
                     this._timeout = setTimeout(function() {
                       Draggables._timeout = null;
                       window.focus();
                       Draggables.activeDraggable = draggable;
                     }.bind(this), draggable.options.delay);
                   } else {
                     window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
                     this.activeDraggable = draggable;
                   }
                 },
                 deactivate: function() {
                   this.activeDraggable = null;
                 },
                 updateDrag: function(event) {
                   if(!this.activeDraggable) return;
                   var pointer = [Event.pointerX(event), Event.pointerY(event)];
                   // Mozilla-based browsers fire successive mousemove events with
                   // the same coordinates, prevent needless redrawing (moz bug?)
                   if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
                   this._lastPointer = pointer;
                   this.activeDraggable.updateDrag(event, pointer);
                 },
                 endDrag: function(event) {
                   if(this._timeout) {
                     clearTimeout(this._timeout);
                     this._timeout = null;
                   }
                   if(!this.activeDraggable) return;
                   this._lastPointer = null;
                   this.activeDraggable.endDrag(event);
                   this.activeDraggable = null;
                 },
                 keyPress: function(event) {
                   if(this.activeDraggable)
                     this.activeDraggable.keyPress(event);
                 },
                 addObserver: function(observer) {
                   this.observers.push(observer);
                   this._cacheObserverCallbacks();
                 },
                 removeObserver: function(element) {  // element instead of observer fixes mem leaks
                   this.observers = this.observers.reject( function(o) { return o.element==element });
                   this._cacheObserverCallbacks();
                 },
                 notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
                   if(this[eventName+'Count'] > 0)
                     this.observers.each( function(o) {
                       if(o[eventName]) o[eventName](eventName, draggable, event);
                     });
                   if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
                 },
                 _cacheObserverCallbacks: function() {
                   ['onStart','onEnd','onDrag'].each( function(eventName) {
                     Draggables[eventName+'Count'] = Draggables.observers.select(
                       function(o) { return o[eventName]; }
                     ).length;
                   });
                 }
-            - }
+            + };
               /*--------------------------------------------------------------------------*/
               var Draggable = Class.create({
                 initialize: function(element) {
                   var defaults = {
                     handle: false,
                     reverteffect: function(element, top_offset, left_offset) {
                       var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
                       new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
                         queue: {scope:'_draggable', position:'end'}
                       });
                     },
                     endeffect: function(element) {
                       var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
                       new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
                         queue: {scope:'_draggable', position:'end'},
                         afterFinish: function(){
                           Draggable._dragging[element] = false
                         }
                       });
                     },
                     zindex: 1000,
                     revert: false,
                     quiet: false,
                     scroll: false,
                     scrollSensitivity: 20,
                     scrollSpeed: 15,
                     snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
                     delay: 0
                   };
                   if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
                     Object.extend(defaults, {
                       starteffect: function(element) {
                         element._opacity = Element.getOpacity(element);
                         Draggable._dragging[element] = true;
                         new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
                       }
                     });
                   var options = Object.extend(defaults, arguments[1] || { });
                   this.element = $(element);
                   if(options.handle && Object.isString(options.handle))
                     this.handle = this.element.down('.'+options.handle, 0);
                   Draggables.register(this);
                 },
                 destroy: function() {
                   Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
                   Draggables.unregister(this);
                 },
                 currentDelta: function() {
                   return([
                     parseInt(Element.getStyle(this.element,'left') || '0'),
                     parseInt(Element.getStyle(this.element,'top') || '0')]);
                 },
                 initDrag: function(event) {
                   if(!Object.isUndefined(Draggable._dragging[this.element]) &&
                     Draggable._dragging[this.element]) return;
                   if(Event.isLeftClick(event)) {
                     // abort on form elements, fixes a Firefox issue
                     var src = Event.element(event);
                     if((tag_name = src.tagName.toUpperCase()) && (
                       tag_name=='INPUT' ||
                       tag_name=='SELECT' ||
                       tag_name=='OPTION' ||
                       tag_name=='BUTTON' ||
                       tag_name=='TEXTAREA')) return;
                     var pointer = [Event.pointerX(event), Event.pointerY(event)];
                     var pos     = Position.cumulativeOffset(this.element);
                     this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
                     Draggables.activate(this);
                     Event.stop(event);
                   }
                 },
                 startDrag: function(event) {
                   this.dragging = true;
                   if(!this.delta)
                     this.delta = this.currentDelta();
                   if(this.options.zindex) {
                     this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
                     this.element.style.zIndex = this.options.zindex;
                   }
                   if(this.options.ghosting) {
                     this._clone = this.element.cloneNode(true);
-            -       this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+            +       this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
-            -       if (!this.element._originallyAbsolute)
+            +       if (!this._originallyAbsolute)
                       Position.absolutize(this.element);
                     this.element.parentNode.insertBefore(this._clone, this.element);
                   }
                   if(this.options.scroll) {
                     if (this.options.scroll == window) {
                       var where = this._getWindowScroll(this.options.scroll);
                       this.originalScrollLeft = where.left;
                       this.originalScrollTop = where.top;
                     } else {
                       this.originalScrollLeft = this.options.scroll.scrollLeft;
                       this.originalScrollTop = this.options.scroll.scrollTop;
                     }
                   }
                   Draggables.notify('onStart', this, event);
                   if(this.options.starteffect) this.options.starteffect(this.element);
                 },
                 updateDrag: function(event, pointer) {
                   if(!this.dragging) this.startDrag(event);
                   if(!this.options.quiet){
                     Position.prepare();
                     Droppables.show(pointer, this.element);
                   }
                   Draggables.notify('onDrag', this, event);
                   this.draw(pointer);
                   if(this.options.change) this.options.change(this);
                   if(this.options.scroll) {
                     this.stopScrolling();
                     var p;
                     if (this.options.scroll == window) {
                       with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
                     } else {
                       p = Position.page(this.options.scroll);
                       p[0] += this.options.scroll.scrollLeft + Position.deltaX;
                       p[1] += this.options.scroll.scrollTop + Position.deltaY;
                       p.push(p[0]+this.options.scroll.offsetWidth);
                       p.push(p[1]+this.options.scroll.offsetHeight);
                     }
                     var speed = [0,0];
                     if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
                     if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
                     if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
                     if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
                     this.startScrolling(speed);
                   }
                   // fix AppleWebKit rendering
                   if(Prototype.Browser.WebKit) window.scrollBy(0,0);
                   Event.stop(event);
                 },
                 finishDrag: function(event, success) {
                   this.dragging = false;
                   if(this.options.quiet){
                     Position.prepare();
                     var pointer = [Event.pointerX(event), Event.pointerY(event)];
                     Droppables.show(pointer, this.element);
                   }
                   if(this.options.ghosting) {
-            -       if (!this.element._originallyAbsolute)
+            +       if (!this._originallyAbsolute)
                       Position.relativize(this.element);
-            -       delete this.element._originallyAbsolute;
+            +       delete this._originallyAbsolute;
                     Element.remove(this._clone);
                     this._clone = null;
                   }
                   var dropped = false;
                   if(success) {
                     dropped = Droppables.fire(event, this.element);
                     if (!dropped) dropped = false;
                   }
                   if(dropped && this.options.onDropped) this.options.onDropped(this.element);
                   Draggables.notify('onEnd', this, event);
                   var revert = this.options.revert;
                   if(revert && Object.isFunction(revert)) revert = revert(this.element);
                   var d = this.currentDelta();
                   if(revert && this.options.reverteffect) {
                     if (dropped == 0 || revert != 'failure')
                       this.options.reverteffect(this.element,
                         d[1]-this.delta[1], d[0]-this.delta[0]);
                   } else {
                     this.delta = d;
                   }
                   if(this.options.zindex)
                     this.element.style.zIndex = this.originalZ;
                   if(this.options.endeffect)
                     this.options.endeffect(this.element);
                   Draggables.deactivate(this);
                   Droppables.reset();
                 },
                 keyPress: function(event) {
                   if(event.keyCode!=Event.KEY_ESC) return;
                   this.finishDrag(event, false);
                   Event.stop(event);
                 },
                 endDrag: function(event) {
                   if(!this.dragging) return;
                   this.stopScrolling();
                   this.finishDrag(event, true);
                   Event.stop(event);
                 },
                 draw: function(point) {
                   var pos = Position.cumulativeOffset(this.element);
                   if(this.options.ghosting) {
                     var r   = Position.realOffset(this.element);
                     pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
                   }
                   var d = this.currentDelta();
                   pos[0] -= d[0]; pos[1] -= d[1];
                   if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
                     pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
                     pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
                   }
                   var p = [0,1].map(function(i){
                     return (point[i]-pos[i]-this.offset[i])
                   }.bind(this));
                   if(this.options.snap) {
                     if(Object.isFunction(this.options.snap)) {
                       p = this.options.snap(p[0],p[1],this);
                     } else {
                     if(Object.isArray(this.options.snap)) {
                       p = p.map( function(v, i) {
-            -           return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
+            +           return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));
                     } else {
                       p = p.map( function(v) {
-            -           return (v/this.options.snap).round()*this.options.snap }.bind(this))
+            +           return (v/this.options.snap).round()*this.options.snap }.bind(this));
                     }
                   }}
                   var style = this.element.style;
                   if((!this.options.constraint) || (this.options.constraint=='horizontal'))
                     style.left = p[0] + "px";
                   if((!this.options.constraint) || (this.options.constraint=='vertical'))
                     style.top  = p[1] + "px";
                   if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
                 },
                 stopScrolling: function() {
                   if(this.scrollInterval) {
                     clearInterval(this.scrollInterval);
                     this.scrollInterval = null;
                     Draggables._lastScrollPointer = null;
                   }
                 },
                 startScrolling: function(speed) {
                   if(!(speed[0] || speed[1])) return;
                   this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
                   this.lastScrolled = new Date();
                   this.scrollInterval = setInterval(this.scroll.bind(this), 10);
                 },
                 scroll: function() {
                   var current = new Date();
                   var delta = current - this.lastScrolled;
                   this.lastScrolled = current;
                   if(this.options.scroll == window) {
                     with (this._getWindowScroll(this.options.scroll)) {
                       if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
                         var d = delta / 1000;
                         this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
                       }
                     }
                   } else {
                     this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
                     this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
                   }
                   Position.prepare();
                   Droppables.show(Draggables._lastPointer, this.element);
                   Draggables.notify('onDrag', this);
                   if (this._isScrollChild) {
                     Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
                     Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
                     Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
                     if (Draggables._lastScrollPointer[0] < 0)
                       Draggables._lastScrollPointer[0] = 0;
                     if (Draggables._lastScrollPointer[1] < 0)
                       Draggables._lastScrollPointer[1] = 0;
                     this.draw(Draggables._lastScrollPointer);
                   }
                   if(this.options.change) this.options.change(this);
                 },
                 _getWindowScroll: function(w) {
                   var T, L, W, H;
                   with (w.document) {
                     if (w.document.documentElement && documentElement.scrollTop) {
                       T = documentElement.scrollTop;
                       L = documentElement.scrollLeft;
                     } else if (w.document.body) {
                       T = body.scrollTop;
                       L = body.scrollLeft;
                     }
                     if (w.innerWidth) {
                       W = w.innerWidth;
                       H = w.innerHeight;
                     } else if (w.document.documentElement && documentElement.clientWidth) {
                       W = documentElement.clientWidth;
                       H = documentElement.clientHeight;
                     } else {
                       W = body.offsetWidth;
-            -         H = body.offsetHeight
+            +         H = body.offsetHeight;
                     }
                   }
                   return { top: T, left: L, width: W, height: H };
                 }
               });
               Draggable._dragging = { };
               /*--------------------------------------------------------------------------*/
               var SortableObserver = Class.create({
                 initialize: function(element, observer) {
                   this.element   = $(element);
                   this.observer  = observer;
                   this.lastValue = Sortable.serialize(this.element);
                 },
                 onStart: function() {
                   this.lastValue = Sortable.serialize(this.element);
                 },
                 onEnd: function() {
                   Sortable.unmark();
                   if(this.lastValue != Sortable.serialize(this.element))
                     this.observer(this.element)
                 }
               });
               var Sortable = {
                 SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
                 sortables: { },
                 _findRootElement: function(element) {
                   while (element.tagName.toUpperCase() != "BODY") {
                     if(element.id && Sortable.sortables[element.id]) return element;
                     element = element.parentNode;
                   }
                 },
                 options: function(element) {
                   element = Sortable._findRootElement($(element));
                   if(!element) return;
                   return Sortable.sortables[element.id];
                 },
                 destroy: function(element){
-            -     var s = Sortable.options(element);
+            +     element = $(element);
+            +     var s = Sortable.sortables[element.id];
                   if(s) {
                     Draggables.removeObserver(s.element);
                     s.droppables.each(function(d){ Droppables.remove(d) });
                     s.draggables.invoke('destroy');
                     delete Sortable.sortables[s.element.id];
                   }
                 },
                 create: function(element) {
                   element = $(element);
                   var options = Object.extend({
                     element:     element,
                     tag:         'li',       // assumes li children, override with tag: 'tagname'
                     dropOnEmpty: false,
                     tree:        false,
                     treeTag:     'ul',
                     overlap:     'vertical', // one of 'vertical', 'horizontal'
                     constraint:  'vertical', // one of 'vertical', 'horizontal', false
                     containment: element,    // also takes array of elements (or id's); or false
                     handle:      false,      // or a CSS class
                     only:        false,
                     delay:       0,
                     hoverclass:  null,
                     ghosting:    false,
                     quiet:       false,
                     scroll:      false,
                     scrollSensitivity: 20,
                     scrollSpeed: 15,
                     format:      this.SERIALIZE_RULE,
                     // these take arrays of elements or ids and can be
                     // used for better initialization performance
                     elements:    false,
                     handles:     false,
                     onChange:    Prototype.emptyFunction,
                     onUpdate:    Prototype.emptyFunction
                   }, arguments[1] || { });
                   // clear any old sortable with same element
                   this.destroy(element);
                   // build options for the draggables
                   var options_for_draggable = {
                     revert:      true,
                     quiet:       options.quiet,
                     scroll:      options.scroll,
                     scrollSpeed: options.scrollSpeed,
                     scrollSensitivity: options.scrollSensitivity,
                     delay:       options.delay,
                     ghosting:    options.ghosting,
                     constraint:  options.constraint,
                     handle:      options.handle };
                   if(options.starteffect)
                     options_for_draggable.starteffect = options.starteffect;
                   if(options.reverteffect)
                     options_for_draggable.reverteffect = options.reverteffect;
                   else
                     if(options.ghosting) options_for_draggable.reverteffect = function(element) {
                       element.style.top  = 0;
                       element.style.left = 0;
                     };
                   if(options.endeffect)
                     options_for_draggable.endeffect = options.endeffect;
                   if(options.zindex)
                     options_for_draggable.zindex = options.zindex;
                   // build options for the droppables
                   var options_for_droppable = {
                     overlap:     options.overlap,
                     containment: options.containment,
                     tree:        options.tree,
                     hoverclass:  options.hoverclass,
                     onHover:     Sortable.onHover
-            -     }
+            +     };
                   var options_for_tree = {
                     onHover:      Sortable.onEmptyHover,
                     overlap:      options.overlap,
                     containment:  options.containment,
                     hoverclass:   options.hoverclass
-            -     }
+            +     };
                   // fix for gecko engine
                   Element.cleanWhitespace(element);
                   options.draggables = [];
                   options.droppables = [];
                   // drop on empty handling
                   if(options.dropOnEmpty || options.tree) {
                     Droppables.add(element, options_for_tree);
                     options.droppables.push(element);
                   }
                   (options.elements || this.findElements(element, options) || []).each( function(e,i) {
                     var handle = options.handles ? $(options.handles[i]) :
                       (options.handle ? $(e).select('.' + options.handle)[0] : e);
                     options.draggables.push(
                       new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
                     Droppables.add(e, options_for_droppable);
                     if(options.tree) e.treeNode = element;
                     options.droppables.push(e);
                   });
                   if(options.tree) {
                     (Sortable.findTreeElements(element, options) || []).each( function(e) {
                       Droppables.add(e, options_for_tree);
                       e.treeNode = element;
                       options.droppables.push(e);
                     });
                   }
                   // keep reference
                   this.sortables[element.id] = options;
                   // for onupdate
                   Draggables.addObserver(new SortableObserver(element, options.onUpdate));
                 },
                 // return all suitable-for-sortable elements in a guaranteed order
                 findElements: function(element, options) {
                   return Element.findChildren(
                     element, options.only, options.tree ? true : false, options.tag);
                 },
                 findTreeElements: function(element, options) {
                   return Element.findChildren(
                     element, options.only, options.tree ? true : false, options.treeTag);
                     Sortable.options(oldParentNode).onChange(element);
                     droponOptions.onChange(element);
                   }
                 },
                 unmark: function() {
                   if(Sortable._marker) Sortable._marker.hide();
                 },
                 mark: function(dropon, position) {
                   // mark on ghosting only
                   var sortable = Sortable.options(dropon.parentNode);
                   if(sortable && !sortable.ghosting) return;
                   if(!Sortable._marker) {
                     Sortable._marker =
                       ($('dropmarker') || Element.extend(document.createElement('DIV'))).
                         hide().addClassName('dropmarker').setStyle({position:'absolute'});
                     document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
                   }
                   var offsets = Position.cumulativeOffset(dropon);
                   Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
                   if(position=='after')
                     if(sortable.overlap == 'horizontal')
                       Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
                     else
                       Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
                   Sortable._marker.show();
                 },
                 _tree: function(element, options, parent) {
                   var children = Sortable.findElements(element, options) || [];
                   for (var i = 0; i < children.length; ++i) {
                     var match = children[i].id.match(options.format);
                     if (!match) continue;
                     var child = {
                       id: encodeURIComponent(match ? match[1] : null),
                       element: element,
                       parent: parent,
                       children: [],
                       position: parent.children.length,
                       container: $(children[i]).down(options.treeTag)
-            -       }
+            +       };
                     /* Get the element containing the children and recurse over it */
                     if (child.container)
-            -         this._tree(child.container, options, child)
+            +         this._tree(child.container, options, child);
                     parent.children.push (child);
                   }
                   return parent;
                 },
                 tree: function(element) {
                   element = $(element);
                   var sortableOptions = this.options(element);
                   var options = Object.extend({
                     tag: sortableOptions.tag,
                     treeTag: sortableOptions.treeTag,
                     only: sortableOptions.only,
                     name: element.id,
                     format: sortableOptions.format
                   }, arguments[1] || { });
                   var root = {
                     id: null,
                     parent: null,
                     children: [],
                     container: element,
                     position: 0
-            -     }
+            +     };
                   return Sortable._tree(element, options, root);
                 },
                 /* Construct a [i] index for a particular node */
                 _constructIndex: function(node) {
                   var index = '';
                   do {
                     if (node.id) index = '[' + node.position + ']' + index;
                   } while ((node = node.parent) != null);
                   return index;
                 },
                 sequence: function(element) {
                   element = $(element);
                   var options = Object.extend(this.options(element), arguments[1] || { });
                   return $(this.findElements(element, options) || []).map( function(item) {
                     return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
                   });
                 },
                 setSequence: function(element, new_sequence) {
                   element = $(element);
                   var options = Object.extend(this.options(element), arguments[2] || { });
                   var nodeMap = { };
                   this.findElements(element, options).each( function(n) {
                       if (n.id.match(options.format))
                           nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
                       n.parentNode.removeChild(n);
                   });
                   new_sequence.each(function(ident) {
                     var n = nodeMap[ident];
                     if (n) {
                       n[1].appendChild(n[0]);
                       delete nodeMap[ident];
                     }
                   });
                 },
                 serialize: function(element) {
                   element = $(element);
                   var options = Object.extend(Sortable.options(element), arguments[1] || { });
                   var name = encodeURIComponent(
                     (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
                   if (options.tree) {
                     return Sortable.tree(element, arguments[1]).children.map( function (item) {
                       return [name + Sortable._constructIndex(item) + "[id]=" +
                               encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
                     }).flatten().join('&');
                   } else {
                     return Sortable.sequence(element, arguments[1]).map( function(item) {
                       return name + "[]=" + encodeURIComponent(item);
                     }).join('&');
                   }
                 }
-            - }
+            + };
               // Returns true if child is contained within element
               Element.isParent = function(child, element) {
                 if (!child.parentNode || child == element) return false;
                 if (child.parentNode == element) return true;
                 return Element.isParent(child.parentNode, element);
-            - }
+            + };
               Element.findChildren = function(element, only, recursive, tagName) {
                 if(!element.hasChildNodes()) return null;
                 tagName = tagName.toUpperCase();
                 if(only) only = [only].flatten();
                 var elements = [];
                 $A(element.childNodes).each( function(e) {
                   if(e.tagName && e.tagName.toUpperCase()==tagName &&
                     (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
                       elements.push(e);
                   if(recursive) {
                     var grandchildren = Element.findChildren(e, only, recursive, tagName);
                     if(grandchildren) elements.push(grandchildren);
                   }
                 });
                 return (elements.length>0 ? elements.flatten() : []);
-            - }
+            + };
               Element.offsetSize = function (element, type) {
                 return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
-            - }
+            + };
  No newline at end of file

public/javascripts/effects.js ¶ +53 -45

               /*--------------------------------------------------------------------------*/
               Element.collectTextNodes = function(element) {
                 return $A($(element).childNodes).collect( function(node) {
                   return (node.nodeType==3 ? node.nodeValue :
                     (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
                 }).flatten().join('');
               };
               Element.collectTextNodesIgnoreClass = function(element, className) {
                 return $A($(element).childNodes).collect( function(node) {
                   return (node.nodeType==3 ? node.nodeValue :
                     ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
                       Element.collectTextNodesIgnoreClass(node, className) : ''));
                 }).flatten().join('');
               };
               Element.setContentZoom = function(element, percent) {
                 element = $(element);
                 element.setStyle({fontSize: (percent/100) + 'em'});
                 if (Prototype.Browser.WebKit) window.scrollBy(0,0);
                 return element;
               };
               Element.getInlineOpacity = function(element){
                 return $(element).style.opacity || '';
               };
               Element.forceRerendering = function(element) {
                 try {
                   element = $(element);
                   var n = document.createTextNode(' ');
                   element.appendChild(n);
                   element.removeChild(n);
                 } catch(e) { }
               };
               /*--------------------------------------------------------------------------*/
               var Effect = {
                 _elementDoesNotExistError: {
                   name: 'ElementDoesNotExistError',
                   message: 'The specified DOM element does not exist, but is required for this effect to operate'
                 },
                 Transitions: {
                   linear: Prototype.K,
                   sinoidal: function(pos) {
-            -       return (-Math.cos(pos*Math.PI)/2) + 0.5;
+            +       return (-Math.cos(pos*Math.PI)/2) + .5;
                   },
                   reverse: function(pos) {
                     return 1-pos;
                   },
                   flicker: function(pos) {
-            -       var pos = ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+            +       var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
                     return pos > 1 ? 1 : pos;
                   },
                   wobble: function(pos) {
-            -       return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+            +       return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
                   },
                   pulse: function(pos, pulses) {
-            -       pulses = pulses || 5;
+            +       return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
-            -       return (
-            -         ((pos % (1/pulses)) * pulses).round() == 0 ?
-            -               ((pos * pulses * 2) - (pos * pulses * 2).floor()) :
-            -           1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
-            -         );
                   },
                   spring: function(pos) {
                     return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
                   },
                   none: function(pos) {
                     return 0;
                   },
                   full: function(pos) {
                     return 1;
                   }
                 },
                 DefaultOptions: {
                   duration:   1.0,   // seconds
                   fps:        100,   // 100= assume 66fps max.
                   sync:       false, // true for combining
                   from:       0.0,
                   to:         1.0,
                   delay:      0.0,
                   queue:      'parallel'
                 },
                 tagifyText: function(element) {
                   var tagifyStyle = 'position:relative';
                   if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
                   element = $(element);
                   $A(element.childNodes).each( function(child) {
                     if (child.nodeType==3) {
                       child.nodeValue.toArray().each( function(character) {
                         element.insertBefore(
                           new Element('span', {style: tagifyStyle}).update(
                             character == ' ' ? String.fromCharCode(160) : character),
                             child);
                       });
                       Element.remove(child);
                     }
                   });
                 },
                 multiple: function(element, effect) {
                   var elements;
                   if (((typeof element == 'object') ||
                       Object.isFunction(element)) &&
                      (element.length))
                     elements = element;
                   else
                     elements = $(element).childNodes;
                   var options = Object.extend({
                     speed: 0.1,
                   if (!this.interval)
                     this.interval = setInterval(this.loop.bind(this), 15);
                 },
                 remove: function(effect) {
                   this.effects = this.effects.reject(function(e) { return e==effect });
                   if (this.effects.length == 0) {
                     clearInterval(this.interval);
                     this.interval = null;
                   }
                 },
                 loop: function() {
                   var timePos = new Date().getTime();
                   for(var i=0, len=this.effects.length;i<len;i++)
                     this.effects[i] && this.effects[i].loop(timePos);
                 }
               });
               Effect.Queues = {
                 instances: $H(),
                 get: function(queueName) {
                   if (!Object.isString(queueName)) return queueName;
                   return this.instances.get(queueName) ||
                     this.instances.set(queueName, new Effect.ScopedQueue());
                 }
               };
               Effect.Queue = Effect.Queues.get('global');
               Effect.Base = Class.create({
                 position: null,
                 start: function(options) {
                   function codeForEvent(options,eventName){
                     return (
                       (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
                       (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
                     );
                   }
                   if (options && options.transition === false) options.transition = Effect.Transitions.linear;
                   this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
                   this.currentFrame = 0;
                   this.state        = 'idle';
                   this.startOn      = this.options.delay*1000;
                   this.finishOn     = this.startOn+(this.options.duration*1000);
                   this.fromToDelta  = this.options.to-this.options.from;
                   this.totalTime    = this.finishOn-this.startOn;
                   this.totalFrames  = this.options.fps*this.options.duration;
-            -     eval('this.render = function(pos){ '+
+            +     this.render = (function() {
-            -       'if (this.state=="idle"){this.state="running";'+
+            +       function dispatch(effect, eventName) {
-            -       codeForEvent(this.options,'beforeSetup')+
+            +         if (effect.options[eventName + 'Internal'])
-            -       (this.setup ? 'this.setup();':'')+
+            +           effect.options[eventName + 'Internal'](effect);
-            -       codeForEvent(this.options,'afterSetup')+
+            +         if (effect.options[eventName])
-            -       '};if (this.state=="running"){'+
+            +           effect.options[eventName](effect);
-            -       'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
+            +       }
-            -       'this.position=pos;'+
-            -       codeForEvent(this.options,'beforeUpdate')+
+            +       return function(pos) {
-            -       (this.update ? 'this.update(pos);':'')+
+            +         if (this.state === "idle") {
-            -       codeForEvent(this.options,'afterUpdate')+
+            +           this.state = "running";
-            -       '}}');
+            +           dispatch(this, 'beforeSetup');
+            +           if (this.setup) this.setup();
+            +           dispatch(this, 'afterSetup');
+            +         }
+            +         if (this.state === "running") {
+            +           pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
+            +           this.position = pos;
+            +           dispatch(this, 'beforeUpdate');
+            +           if (this.update) this.update(pos);
+            +           dispatch(this, 'afterUpdate');
+            +         }
+            +       };
+            +     })();
                   this.event('beforeStart');
                   if (!this.options.sync)
                     Effect.Queues.get(Object.isString(this.options.queue) ?
                       'global' : this.options.queue.scope).add(this);
                 },
                 loop: function(timePos) {
                   if (timePos >= this.startOn) {
                     if (timePos >= this.finishOn) {
                       this.render(1.0);
                       this.cancel();
                       this.event('beforeFinish');
                       if (this.finish) this.finish();
                       this.event('afterFinish');
                       return;
                     }
                     var pos   = (timePos - this.startOn) / this.totalTime,
                         frame = (pos * this.totalFrames).round();
                     if (frame > this.currentFrame) {
                       this.render(pos);
                       this.currentFrame = frame;
                     }
                   }
                 },
                 cancel: function() {
                   if (!this.options.sync)
                     Effect.Queues.get(Object.isString(this.options.queue) ?
                       'global' : this.options.queue.scope).remove(this);
                   this.state = 'finished';
                 },
                 event: function(eventName) {
                   if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
                   if (this.options[eventName]) this.options[eventName](this);
                 },
                 inspect: function() {
                   var data = $H();
                   for(property in this)
                     if (!Object.isFunction(this[property])) data.set(property, this[property]);
                   return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
                 }
               });
               Effect.Parallel = Class.create(Effect.Base, {
                 initialize: function(effects) {
                   this.effects = effects || [];
                   this.start(arguments[1]);
                 },
                 update: function(position) {
                       if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
                     } else {
                       if (this.options.scaleY) d.top = -topd + 'px';
                       if (this.options.scaleX) d.left = -leftd + 'px';
                     }
                   }
                   this.element.setStyle(d);
                 }
               });
               Effect.Highlight = Class.create(Effect.Base, {
                 initialize: function(element) {
                   this.element = $(element);
                   if (!this.element) throw(Effect._elementDoesNotExistError);
                   var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
                   this.start(options);
                 },
                 setup: function() {
                   // Prevent executing on elements not in the layout flow
                   if (this.element.getStyle('display')=='none') { this.cancel(); return; }
                   // Disable background image during the effect
                   this.oldStyle = { };
                   if (!this.options.keepBackgroundImage) {
                     this.oldStyle.backgroundImage = this.element.getStyle('background-image');
                     this.element.setStyle({backgroundImage: 'none'});
                   }
                   if (!this.options.endcolor)
                     this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
                   if (!this.options.restorecolor)
                     this.options.restorecolor = this.element.getStyle('background-color');
                   // init color calculations
                   this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
                   this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
                 },
                 update: function(position) {
                   this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
                     return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
                 },
                 finish: function() {
                   this.element.setStyle(Object.extend(this.oldStyle, {
                     backgroundColor: this.options.restorecolor
                   }));
                 }
               });
               Effect.ScrollTo = function(element) {
                 var options = arguments[1] || { },
                 scrollOffsets = document.viewport.getScrollOffsets(),
-            -     elementOffsets = $(element).cumulativeOffset(),
+            +   elementOffsets = $(element).cumulativeOffset();
-            -     max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();
                 if (options.offset) elementOffsets[1] += options.offset;
                 return new Effect.Tween(null,
                   scrollOffsets.top,
-            -     elementOffsets[1] > max ? max : elementOffsets[1],
+            +     elementOffsets[1],
                   options,
-            -     function(p){ scrollTo(scrollOffsets.left, p.round()) }
+            +     function(p){ scrollTo(scrollOffsets.left, p.round()); }
                 );
               };
               /* ------------- combination effects ------------- */
               Effect.Fade = function(element) {
                 element = $(element);
                 var oldOpacity = element.getInlineOpacity();
                 var options = Object.extend({
                   from: element.getOpacity() || 1.0,
                   to:   0.0,
                   afterFinishInternal: function(effect) {
                     if (effect.options.to!=0) return;
                     effect.element.hide().setStyle({opacity: oldOpacity});
                   }
                 }, arguments[1] || { });
                 return new Effect.Opacity(element,options);
               };
               Effect.Appear = function(element) {
                 element = $(element);
                 var options = Object.extend({
                 from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
                 to:   1.0,
                 // force Safari to render floated elements properly
                 afterFinishInternal: function(effect) {
                   effect.element.forceRerendering();
                 },
                 beforeSetup: function(effect) {
                   effect.element.setOpacity(effect.options.from).show();
                 }}, arguments[1] || { });
                 return new Effect.Opacity(element,options);
               };
               Effect.Puff = function(element) {
                 element = $(element);
                 var oldStyle = {
                   opacity: element.getInlineOpacity(),
                   position: element.getStyle('position'),
                   top:  element.style.top,
                   left: element.style.left,
                   width: element.style.width,
                   height: element.style.height
                 };
                 return new Effect.Parallel(
                  [ new Effect.Scale(element, 200,
                     { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
                    new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
                    Object.extend({ duration: 1.0,
                     beforeSetupInternal: function(effect) {
-            -         Position.absolutize(effect.effects[0].element)
+            +         Position.absolutize(effect.effects[0].element);
                     },
                     afterFinishInternal: function(effect) {
                        effect.effects[0].element.hide().setStyle(oldStyle); }
                    }, arguments[1] || { })
                  );
               };
               Effect.BlindUp = function(element) {
                 element = $(element);
                 element.makeClipping();
                 return new Effect.Scale(element, 0,
                   Object.extend({ scaleContent: false,
                     scaleX: false,
                     restoreAfterFinish: true,
                     afterFinishInternal: function(effect) {
                       effect.element.hide().undoClipping();
                     }
                   }, arguments[1] || { })
                 );
               };
               Effect.BlindDown = function(element) {
                 element = $(element);
                 var elementDimensions = element.getDimensions();
                 return new Effect.Scale(element, 100, Object.extend({
                   scaleContent: false,
                   scaleX: false,
                   scaleFrom: 0,
                   scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
                   restoreAfterFinish: true,
                   afterSetup: function(effect) {
                     effect.element.makeClipping().setStyle({height: '0px'}).show();
                   },
                   afterFinishInternal: function(effect) {
                     effect.element.undoClipping();
                   }
                 }, arguments[1] || { }));
               };
               Effect.SwitchOff = function(element) {
                 element = $(element);
                 var oldOpacity = element.getInlineOpacity();
                 return new Effect.Appear(element, Object.extend({
                   duration: 0.4,
                   from: 0,
                   transition: Effect.Transitions.flicker,
                   afterFinishInternal: function(effect) {
                     new Effect.Scale(effect.element, 1, {
                       duration: 0.3, scaleFromCenter: true,
                       scaleX: false, scaleContent: false, restoreAfterFinish: true,
                       beforeSetup: function(effect) {
                         effect.element.makePositioned().makeClipping();
                       },
                       afterFinishInternal: function(effect) {
                         effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
                       }
-            -       })
+            +       });
                   }
                 }, arguments[1] || { }));
               };
               Effect.DropOut = function(element) {
                 element = $(element);
                 var oldStyle = {
                   top: element.getStyle('top'),
                   left: element.getStyle('left'),
                   opacity: element.getInlineOpacity() };
                 return new Effect.Parallel(
                   [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
                     new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
                   Object.extend(
                     { duration: 0.5,
                       beforeSetup: function(effect) {
                         effect.effects[0].element.makePositioned();
                       },
                       afterFinishInternal: function(effect) {
                         effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
                       }
                     }, arguments[1] || { }));
               };
               Effect.Shake = function(element) {
                 element = $(element);
                 var options = Object.extend({
                   distance: 20,
                   duration: 0.5
                 }, arguments[1] || {});
                 var distance = parseFloat(options.distance);
                 var split = parseFloat(options.duration) / 10.0;
                 var oldStyle = {
                   top: element.getStyle('top'),
                   left: element.getStyle('left') };
                   return new Effect.Move(element,
                     { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
                   new Effect.Move(effect.element,
                     { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
                   new Effect.Move(effect.element,
                     { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
                   new Effect.Move(effect.element,
                     { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
                   new Effect.Move(effect.element,
                     { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
                   new Effect.Move(effect.element,
                     { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
                       effect.element.undoPositioned().setStyle(oldStyle);
-            -   }}) }}) }}) }}) }}) }});
+            +   }}); }}); }}); }}); }}); }});
               };
               Effect.SlideDown = function(element) {
                 element = $(element).cleanWhitespace();
                 // SlideDown need to have the content of the element wrapped in a container element with fixed height!
                 var oldInnerBottom = element.down().getStyle('bottom');
                 var elementDimensions = element.getDimensions();
                 return new Effect.Scale(element, 100, Object.extend({
                   scaleContent: false,
                   scaleX: false,
                   scaleFrom: window.opera ? 0 : 1,
                   scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
                   restoreAfterFinish: true,
                   afterSetup: function(effect) {
                     effect.element.makePositioned();
                     effect.element.down().makePositioned();
                     if (window.opera) effect.element.setStyle({top: ''});
                     effect.element.makeClipping().setStyle({height: '0px'}).show();
                   },
                   afterUpdateInternal: function(effect) {
                     effect.element.down().setStyle({bottom:
                       (effect.dims[0] - effect.element.clientHeight) + 'px' });
                   },
                   afterFinishInternal: function(effect) {
                     effect.element.undoClipping().undoPositioned();
                     effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
                   }, arguments[1] || { })
                 );
               };
               Effect.SlideUp = function(element) {
                 element = $(element).cleanWhitespace();
                 var oldInnerBottom = element.down().getStyle('bottom');
                 var elementDimensions = element.getDimensions();
                 return new Effect.Scale(element, window.opera ? 0 : 1,
                  Object.extend({ scaleContent: false,
                   scaleX: false,
                   scaleMode: 'box',
                   scaleFrom: 100,
                   scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
                   restoreAfterFinish: true,
                   afterSetup: function(effect) {
                     effect.element.makePositioned();
                     effect.element.down().makePositioned();
                     if (window.opera) effect.element.setStyle({top: ''});
                     effect.element.makeClipping().show();
                   },
                   afterUpdateInternal: function(effect) {
                     initialMoveX = initialMoveY = moveX = moveY = 0;
                     break;
                   case 'top-right':
                     initialMoveX = dims.width;
                     initialMoveY = moveY = 0;
                     moveX = -dims.width;
                     break;
                   case 'bottom-left':
                     initialMoveX = moveX = 0;
                     initialMoveY = dims.height;
                     moveY = -dims.height;
                     break;
                   case 'bottom-right':
                     initialMoveX = dims.width;
                     initialMoveY = dims.height;
                     moveX = -dims.width;
                     moveY = -dims.height;
                     break;
                   case 'center':
                     initialMoveX = dims.width / 2;
                     initialMoveY = dims.height / 2;
                     moveX = -dims.width / 2;
                     moveY = -dims.height / 2;
                     break;
                 }
                 return new Effect.Move(element, {
                   x: initialMoveX,
                   y: initialMoveY,
                   duration: 0.01,
                   beforeSetup: function(effect) {
                     effect.element.hide().makeClipping().makePositioned();
                   },
                   afterFinishInternal: function(effect) {
                     new Effect.Parallel(
                       [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
                         new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
                         new Effect.Scale(effect.element, 100, {
                           scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
                           sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
                       ], Object.extend({
                            beforeSetup: function(effect) {
                              effect.effects[0].element.setStyle({height: '0px'}).show();
                            },
                            afterFinishInternal: function(effect) {
                              effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
                            }
                          }, options)
-            -       )
+            +       );
                   }
                 });
               };
               Effect.Shrink = function(element) {
                 element = $(element);
                 var options = Object.extend({
                   direction: 'center',
                   moveTransition: Effect.Transitions.sinoidal,
                   scaleTransition: Effect.Transitions.sinoidal,
                   opacityTransition: Effect.Transitions.none
                 }, arguments[1] || { });
                 var oldStyle = {
                   top: element.style.top,
                   left: element.style.left,
                   height: element.style.height,
                   width: element.style.width,
                   opacity: element.getInlineOpacity() };
                 var dims = element.getDimensions();
                 var moveX, moveY;
                 switch (options.direction) {
                   case 'top-left':
                     moveX = moveY = 0;
                     break;
                   case 'top-right':
                     moveX = dims.width;
                     moveY = 0;
                     break;
                   case 'bottom-left':
                     moveX = 0;
                     moveY = dims.height;
                     break;
                   case 'bottom-right':
                     moveX = dims.width;
                     moveY = dims.height;
                     break;
                   case 'center':
                     moveX = dims.width / 2;
                     moveY = dims.height / 2;
                     break;
                 }
                 return new Effect.Parallel(
                   [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
                     new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
                     new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
                   ], Object.extend({
                        beforeStartInternal: function(effect) {
                          effect.effects[0].element.makePositioned().makeClipping();
                        },
                        afterFinishInternal: function(effect) {
                          effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
                      }, options)
                 );
               };
               Effect.Pulsate = function(element) {
                 element = $(element);
-            -   var options    = arguments[1] || { };
+            +   var options    = arguments[1] || { },
-            -   var oldOpacity = element.getInlineOpacity();
+            +     oldOpacity = element.getInlineOpacity(),
-            -   var transition = options.transition || Effect.Transitions.sinoidal;
+            +     transition = options.transition || Effect.Transitions.linear,
-            -   var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
+            +     reverser   = function(pos){
-            -   reverser.bind(transition);
+            +       return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
+            +     };
+            +
                 return new Effect.Opacity(element,
                   Object.extend(Object.extend({  duration: 2.0, from: 0,
                     afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
                   }, options), {transition: reverser}));
               };
               Effect.Fold = function(element) {
                 element = $(element);
                 var oldStyle = {
                   top: element.style.top,
                   left: element.style.left,
                   width: element.style.width,
                   height: element.style.height };
                 element.makeClipping();
                 return new Effect.Scale(element, 5, Object.extend({
                   scaleContent: false,
                   scaleX: false,
                   afterFinishInternal: function(effect) {
                   new Effect.Scale(element, 1, {
                     scaleContent: false,
                     scaleY: false,
                     afterFinishInternal: function(effect) {
                       effect.element.hide().undoClipping().setStyle(oldStyle);
                     } });
                 }}, arguments[1] || { }));
               };
               Effect.Morph = Class.create(Effect.Base, {
                 initialize: function(element) {
                   this.element = $(element);
                   if (!this.element) throw(Effect._elementDoesNotExistError);
                   var options = Object.extend({
                     style: { }
                   }, arguments[1] || { });
                   if (!Object.isString(options.style)) this.style = $H(options.style);
                   else {
                     if (options.style.include(':'))
                       this.style = options.style.parseStyle();
                     else {
                       this.element.addClassName(options.style);
                       this.style = $H(this.element.getStyles());
                       this.element.removeClassName(options.style);
                       var css = this.element.getStyles();
                       this.style = this.style.reject(function(style) {
                         return style.value == css[style.key];
                       });
                       options.afterFinishInternal = function(effect) {
                         effect.element.addClassName(effect.options.style);
                         effect.transforms.each(function(transform) {
                           effect.element.style[transform.style] = '';
                         });
-            -         }
+            +         };
                     }
                   }
                   this.start(options);
                 },
                 setup: function(){
                   function parseColor(color){
                     if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
                     color = color.parseColor();
                     return $R(0,2).map(function(i){
-            -         return parseInt( color.slice(i*2+1,i*2+3), 16 )
+            +         return parseInt( color.slice(i*2+1,i*2+3), 16 );
                     });
                   }
                   this.transforms = this.style.map(function(pair){
                     var property = pair[0], value = pair[1], unit = null;
                     if (value.parseColor('#zzzzzz') != '#zzzzzz') {
                       value = value.parseColor();
                       unit  = 'color';
                     } else if (property == 'opacity') {
                       value = parseFloat(value);
                       if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
                         this.element.setStyle({zoom: 1});
                     } else if (Element.CSS_LENGTH.test(value)) {
                         var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
                         value = parseFloat(components[1]);
                         unit = (components.length == 3) ? components[2] : null;
                     }
                     var originalValue = this.element.getStyle(property);
                     return {
                       style: property.camelize(),
                       originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
                       targetValue: unit=='color' ? parseColor(value) : value,
                       unit: unit
                     };
                   }.bind(this)).reject(function(transform){
                     return (
                       (transform.originalValue == transform.targetValue) ||
                       (
                         transform.unit != 'color' &&
                         (isNaN(transform.originalValue) || isNaN(transform.targetValue))
                       )
-            -       )
+            +       );
                   });
                 },
                 update: function(position) {
                   var style = { }, transform, i = this.transforms.length;
                   while(i--)
                     style[(transform = this.transforms[i]).style] =
                       transform.unit=='color' ? '#'+
                         (Math.round(transform.originalValue[0]+
                           (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
                         (Math.round(transform.originalValue[1]+
                           (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
                         (Math.round(transform.originalValue[2]+
                           (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
                       (transform.originalValue +
                         (transform.targetValue - transform.originalValue) * position).toFixed(3) +
                           (transform.unit === null ? '' : transform.unit);
                   this.element.setStyle(style, true);
                 }
               });
               Effect.Transform = Class.create({
                 initialize: function(tracks){
                   this.tracks  = [];
                   this.options = arguments[1] || { };
                   this.addTracks(tracks);
                 },
                 addTracks: function(tracks){
                   tracks.each(function(track){
                     track = $H(track);
                     var data = track.values().first();
                     this.tracks.push($H({
                       ids:     track.keys().first(),
                       effect:  Effect.Morph,
                       options: { style: data }
                     }));
                   }.bind(this));
                   return this;
                 },
                 play: function(){
                   return new Effect.Parallel(
                     this.tracks.map(function(track){
                       var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
                       var elements = [$(ids) || $$(ids)].flatten();
                       return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
                     }).flatten(),
                     this.options
                   );
                 }
               });
               Element.CSS_PROPERTIES = $w(
                 'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
                 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
                 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
                 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
                 'fontSize fontWeight height left letterSpacing lineHeight ' +
                 'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
                 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
                 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
                 'right textIndent top width wordSpacing zIndex');
               Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
               String.__parseStyleElement = document.createElement('div');
               String.prototype.parseStyle = function(){
                 var style, styleRules = $H();
                 if (Prototype.Browser.WebKit)
                   style = new Element('div',{style:this}).style;
                 else {
                   String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
                   style = String.__parseStyleElement.childNodes[0].style;
                 }
                 Element.CSS_PROPERTIES.each(function(property){
                   if (style[property]) styleRules.set(property, style[property]);
                 });
                 if (Prototype.Browser.IE && this.include('opacity'))
                   styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
                 return styleRules;
               };
               if (document.defaultView && document.defaultView.getComputedStyle) {
                 Element.getStyles = function(element) {
                   var css = document.defaultView.getComputedStyle($(element), null);
                   return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
                     styles[property] = css[property];
                     return styles;
                   });
                 };
               } else {
                 Element.getStyles = function(element) {
                   element = $(element);
                   var css = element.currentStyle, styles;
-            -     styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
+            +     styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
-            -       hash.set(property, css[property]);
+            +       results[property] = css[property];
-            -       return hash;
+            +       return results;
                   });
-            -     if (!styles.opacity) styles.set('opacity', element.getOpacity());
+            +     if (!styles.opacity) styles.opacity = element.getOpacity();
                   return styles;
                 };
-            - };
+            + }
               Effect.Methods = {
                 morph: function(element, style) {
                   element = $(element);
                   new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
                   return element;
                 },
                 visualEffect: function(element, effect, options) {
-            -     element = $(element)
+            +     element = $(element);
                   var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
                   new Effect[klass](element, options);
                   return element;
                 },
                 highlight: function(element, options) {
                   element = $(element);
                   new Effect.Highlight(element, options);
                   return element;
                 }
               };
               $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
                 'pulsate shake puff squish switchOff dropOut').each(
                 function(effect) {
                   Effect.Methods[effect] = function(element, options){
                     element = $(element);
                     Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
                     return element;
-            -     }
+            +     };
                 }
               );
               $w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
                 function(f) { Effect.Methods[f] = Element[f]; }
               );
-            - Element.addMethods(Effect.Methods);
+            + Element.addMethods(Effect.Methods);
  No newline at end of file

public/javascripts/prototype.js ¶ +345 -250

-            - /*  Prototype JavaScript framework, version 1.6.0.1
+            + /*  Prototype JavaScript framework, version 1.6.0.3
-            -  *  (c) 2005-2007 Sam Stephenson
+            +  *  (c) 2005-2008 Sam Stephenson
                *
                *  Prototype is freely distributable under the terms of an MIT-style license.
                *  For details, see the Prototype web site: http://www.prototypejs.org/
                *
                *--------------------------------------------------------------------------*/
               var Prototype = {
-            -   Version: '1.6.0.1',
+            +   Version: '1.6.0.3',
                 Browser: {
-            -     IE:     !!(window.attachEvent && !window.opera),
+            +     IE:     !!(window.attachEvent &&
-            -     Opera:  !!window.opera,
+            +       navigator.userAgent.indexOf('Opera') === -1),
+            +     Opera:  navigator.userAgent.indexOf('Opera') > -1,
                   WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-            -     Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1,
+            +     Gecko:  navigator.userAgent.indexOf('Gecko') > -1 &&
+            +       navigator.userAgent.indexOf('KHTML') === -1,
                   MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
                 },
                 BrowserFeatures: {
                   XPath: !!document.evaluate,
+            +     SelectorsAPI: !!document.querySelector,
                   ElementExtensions: !!window.HTMLElement,
                   SpecificElementExtensions:
-            -       document.createElement('div').__proto__ &&
+            +       document.createElement('div')['__proto__'] &&
-            -       document.createElement('div').__proto__ !==
+            +       document.createElement('div')['__proto__'] !==
-            -         document.createElement('form').__proto__
+            +         document.createElement('form')['__proto__']
                 },
                 ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
                 JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
                 emptyFunction: function() { },
                 K: function(x) { return x }
               };
               if (Prototype.Browser.MobileSafari)
                 Prototype.BrowserFeatures.SpecificElementExtensions = false;
               /* Based on Alex Arnell's inheritance implementation. */
               var Class = {
                 create: function() {
                   var parent = null, properties = $A(arguments);
                   if (Object.isFunction(properties[0]))
                     parent = properties.shift();
                   function klass() {
                     this.initialize.apply(this, arguments);
                   }
                   Object.extend(klass, Class.Methods);
                   klass.superclass = parent;
                   klass.subclasses = [];
                   if (parent) {
                     var subclass = function() { };
                     subclass.prototype = parent.prototype;
                     klass.prototype = new subclass;
                     parent.subclasses.push(klass);
                   }
                   for (var i = 0; i < properties.length; i++)
                     klass.addMethods(properties[i]);
                   if (!klass.prototype.initialize)
                     klass.prototype.initialize = Prototype.emptyFunction;
                   klass.prototype.constructor = klass;
                   return klass;
                 }
               };
               Class.Methods = {
                 addMethods: function(source) {
                   var ancestor   = this.superclass && this.superclass.prototype;
                   var properties = Object.keys(source);
                   if (!Object.keys({ toString: true }).length)
                     properties.push("toString", "valueOf");
                   for (var i = 0, length = properties.length; i < length; i++) {
                     var property = properties[i], value = source[property];
                     if (ancestor && Object.isFunction(value) &&
                         value.argumentNames().first() == "$super") {
-            -         var method = value, value = Object.extend((function(m) {
+            +         var method = value;
+            +         value = (function(m) {
                         return function() { return ancestor[m].apply(this, arguments) };
-            -         })(property).wrap(method), {
+            +         })(property).wrap(method);
-            -           valueOf:  function() { return method },
-            -           toString: function() { return method.toString() }
+            +         value.valueOf = method.valueOf.bind(method);
-            -         });
+            +         value.toString = method.toString.bind(method);
                     }
                     this.prototype[property] = value;
                   }
                   return this;
                 }
               };
               var Abstract = { };
               Object.extend = function(destination, source) {
                 for (var property in source)
                   destination[property] = source[property];
                 return destination;
               };
               Object.extend(Object, {
                 inspect: function(object) {
                   try {
                     if (Object.isUndefined(object)) return 'undefined';
                     if (object === null) return 'null';
-            -       return object.inspect ? object.inspect() : object.toString();
+            +       return object.inspect ? object.inspect() : String(object);
                   } catch (e) {
                     if (e instanceof RangeError) return '...';
                     throw e;
                   }
                 },
                 toJSON: function(object) {
                   var type = typeof object;
                   switch (type) {
                     case 'undefined':
                     case 'function':
                     case 'unknown': return;
                     case 'boolean': return object.toString();
                   }
                   if (object === null) return 'null';
                   if (object.toJSON) return object.toJSON();
                   if (Object.isElement(object)) return;
                   var results = [];
                   for (var property in object) {
                     var value = Object.toJSON(object[property]);
                     if (!Object.isUndefined(value))
                       results.push(property.toJSON() + ': ' + value);
                   }
                   return '{' + results.join(', ') + '}';
                 },
                 toQueryString: function(object) {
                   return $H(object).toQueryString();
                 },
                 toHTML: function(object) {
                   return object && object.toHTML ? object.toHTML() : String.interpret(object);
                 },
                 keys: function(object) {
                   var keys = [];
                   for (var property in object)
                     keys.push(property);
                   return keys;
                 },
                 values: function(object) {
                   var values = [];
                   for (var property in object)
                     values.push(object[property]);
                   return values;
                 },
                 clone: function(object) {
                   return Object.extend({ }, object);
                 },
                 isElement: function(object) {
-            -     return object && object.nodeType == 1;
+            +     return !!(object && object.nodeType == 1);
                 },
                 isArray: function(object) {
-            -     return object && object.constructor === Array;
+            +     return object != null && typeof object == "object" &&
+            +       'splice' in object && 'join' in object;
                 },
                 isHash: function(object) {
                   return object instanceof Hash;
                 },
                 isFunction: function(object) {
                   return typeof object == "function";
                 },
                 isString: function(object) {
                   return typeof object == "string";
                 },
                 isNumber: function(object) {
                   return typeof object == "number";
                 },
                 isUndefined: function(object) {
                   return typeof object == "undefined";
                 }
               });
               Object.extend(Function.prototype, {
                 argumentNames: function() {
-            -     var names = this.toString().match(/^[\s\(]*function[^(]*\((.*?)\)/)[1].split(",").invoke("strip");
+            +     var names = this.toString().match(/^[\s\(]*function[^(]*\(([^\)]*)\)/)[1]
+            +       .replace(/\s+/g, '').split(',');
                   return names.length == 1 && !names[0] ? [] : names;
                 },
                 bind: function() {
                   if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
                   var __method = this, args = $A(arguments), object = args.shift();
                   return function() {
                     return __method.apply(object, args.concat($A(arguments)));
                   }
                 },
                 bindAsEventListener: function() {
                   var __method = this, args = $A(arguments), object = args.shift();
                   return function(event) {
                     return __method.apply(object, [event || window.event].concat(args));
                   }
                 },
                 curry: function() {
                   if (!arguments.length) return this;
                   var __method = this, args = $A(arguments);
                   return function() {
                     return __method.apply(this, args.concat($A(arguments)));
                   }
                 },
                 delay: function() {
                   var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
                   return window.setTimeout(function() {
                     return __method.apply(__method, args);
                   }, timeout);
                 },
+            +   defer: function() {
+            +     var args = [0.01].concat($A(arguments));
+            +     return this.delay.apply(this, args);
+            +   },
+            +
                 wrap: function(wrapper) {
                   var __method = this;
                   return function() {
                     return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
                   }
                 },
                 methodize: function() {
                   if (this._methodized) return this._methodized;
                   var __method = this;
                   return this._methodized = function() {
                     return __method.apply(null, [this].concat($A(arguments)));
                   };
                 }
               });
-            - Function.prototype.defer = Function.prototype.delay.curry(0.01);
               Date.prototype.toJSON = function() {
                 return '"' + this.getUTCFullYear() + '-' +
                   (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
                   this.getUTCDate().toPaddedString(2) + 'T' +
                   this.getUTCHours().toPaddedString(2) + ':' +
                   this.getUTCMinutes().toPaddedString(2) + ':' +
                   this.getUTCSeconds().toPaddedString(2) + 'Z"';
               };
               var Try = {
                 these: function() {
                   var returnValue;
                   for (var i = 0, length = arguments.length; i < length; i++) {
                     var lambda = arguments[i];
                     try {
                       returnValue = lambda();
                       break;
                     } catch (e) { }
                   }
                   return returnValue;
                 }
               };
               RegExp.prototype.match = RegExp.prototype.test;
               RegExp.escape = function(str) {
                 return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
               };
               /*--------------------------------------------------------------------------*/
               var PeriodicalExecuter = Class.create({
                 initialize: function(callback, frequency) {
                   this.callback = callback;
                   this.frequency = frequency;
                   this.currentlyExecuting = false;
                   this.registerCallback();
                 },
                 registerCallback: function() {
                   this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
                 },
                 execute: function() {
                   this.callback(this);
                 },
                 isJSON: function() {
                   var str = this;
                   if (str.blank()) return false;
                   str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
                   return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
                 },
                 evalJSON: function(sanitize) {
                   var json = this.unfilterJSON();
                   try {
                     if (!sanitize || json.isJSON()) return eval('(' + json + ')');
                   } catch (e) { }
                   throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
                 },
                 include: function(pattern) {
                   return this.indexOf(pattern) > -1;
                 },
                 startsWith: function(pattern) {
                   return this.indexOf(pattern) === 0;
                 },
                 endsWith: function(pattern) {
                   var d = this.length - pattern.length;
                   return d >= 0 && this.lastIndexOf(pattern) === d;
                 },
                 empty: function() {
                   return this == '';
                 },
                 blank: function() {
                   return /^\s*$/.test(this);
                 },
                 interpolate: function(object, pattern) {
                   return new Template(this, pattern).evaluate(object);
                 }
               });
               if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
                 escapeHTML: function() {
                   return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
                 },
                 unescapeHTML: function() {
-            -     return this.replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
+            +     return this.stripTags().replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
                 }
               });
               String.prototype.gsub.prepareReplacement = function(replacement) {
                 if (Object.isFunction(replacement)) return replacement;
                 var template = new Template(replacement);
                 return function(match) { return template.evaluate(match) };
               };
               String.prototype.parseQuery = String.prototype.toQueryParams;
               Object.extend(String.prototype.escapeHTML, {
                 div:  document.createElement('div'),
                 text: document.createTextNode('')
               });
-            - with (String.prototype.escapeHTML) div.appendChild(text);
+            + String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
               var Template = Class.create({
                 initialize: function(template, pattern) {
                   this.template = template.toString();
                   this.pattern = pattern || Template.Pattern;
                 },
                 evaluate: function(object) {
                   if (Object.isFunction(object.toTemplateReplacements))
                     object = object.toTemplateReplacements();
                   return this.template.gsub(this.pattern, function(match) {
                     if (object == null) return '';
                     var before = match[1] || '';
                     if (before == '\\') return match[2];
                     var ctx = object, expr = match[3];
                     var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
                     match = pattern.exec(expr);
                     if (match == null) return before;
                     while (match != null) {
                       var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
                       ctx = ctx[comp];
                       if (null == ctx || '' == match[3]) break;
                       expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
                       match = pattern.exec(expr);
                     }
                     return before + String.interpret(ctx);
-            -     }.bind(this));
+            +     });
                 }
               });
               Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
               var $break = { };
               var Enumerable = {
                 each: function(iterator, context) {
                   var index = 0;
-            -     iterator = iterator.bind(context);
                   try {
                     this._each(function(value) {
-            -         iterator(value, index++);
+            +         iterator.call(context, value, index++);
                     });
                   } catch (e) {
                     if (e != $break) throw e;
                   }
                   return this;
                 },
                 eachSlice: function(number, iterator, context) {
-            -     iterator = iterator ? iterator.bind(context) : Prototype.K;
                   var index = -number, slices = [], array = this.toArray();
+            +     if (number < 1) return array;
                   while ((index += number) < array.length)
                     slices.push(array.slice(index, index+number));
                   return slices.collect(iterator, context);
                 },
                 all: function(iterator, context) {
-            -     iterator = iterator ? iterator.bind(context) : Prototype.K;
+            +     iterator = iterator || Prototype.K;
                   var result = true;
                   this.each(function(value, index) {
-            -       result = result && !!iterator(value, index);
+            +       result = result && !!iterator.call(context, value, index);
                     if (!result) throw $break;
                   });
                   return result;
                 },
                 any: function(iterator, context) {
-            -     iterator = iterator ? iterator.bind(context) : Prototype.K;
+            +     iterator = iterator || Prototype.K;
                   var result = false;
                   this.each(function(value, index) {
-            -       if (result = !!iterator(value, index))
+            +       if (result = !!iterator.call(context, value, index))
                       throw $break;
                   });
                   return result;
                 },
                 collect: function(iterator, context) {
-            -     iterator = iterator ? iterator.bind(context) : Prototype.K;
+            +     iterator = iterator || Prototype.K;
                   var results = [];
                   this.each(function(value, index) {
-            -       results.push(iterator(value, index));
+            +       results.push(iterator.call(context, value, index));
                   });
                   return results;
                 },
                 detect: function(iterator, context) {
-            -     iterator = iterator.bind(context);
                   var result;
                   this.each(function(value, index) {
-            -       if (iterator(value, index)) {
+            +       if (iterator.call(context, value, index)) {
                       result = value;
                       throw $break;
                     }
                   });
                   return result;
                 },
                 findAll: function(iterator, context) {
-            -     iterator = iterator.bind(context);
                   var results = [];
                   this.each(function(value, index) {
-            -       if (iterator(value, index))
+            +       if (iterator.call(context, value, index))
                       results.push(value);
                   });
                   return results;
                 },
                 grep: function(filter, iterator, context) {
-            -     iterator = iterator ? iterator.bind(context) : Prototype.K;
+            +     iterator = iterator || Prototype.K;
                   var results = [];
                   if (Object.isString(filter))
                     filter = new RegExp(filter);
                   this.each(function(value, index) {
                     if (filter.match(value))
-            -         results.push(iterator(value, index));
+            +         results.push(iterator.call(context, value, index));
                   });
                   return results;
                 },
                 include: function(object) {
                   if (Object.isFunction(this.indexOf))
                     if (this.indexOf(object) != -1) return true;
                   var found = false;
                   this.each(function(value) {
                     if (value == object) {
                       found = true;
                       throw $break;
                     }
                   });
                   return found;
                 },
                 inGroupsOf: function(number, fillWith) {
                   fillWith = Object.isUndefined(fillWith) ? null : fillWith;
                   return this.eachSlice(number, function(slice) {
                     while(slice.length < number) slice.push(fillWith);
                     return slice;
                   });
                 },
                 inject: function(memo, iterator, context) {
-            -     iterator = iterator.bind(context);
                   this.each(function(value, index) {
-            -       memo = iterator(memo, value, index);
+            +       memo = iterator.call(context, memo, value, index);
                   });
                   return memo;
                 },
                 invoke: function(method) {
                   var args = $A(arguments).slice(1);
                   return this.map(function(value) {
                     return value[method].apply(value, args);
                   });
                 },
                 max: function(iterator, context) {
-            -     iterator = iterator ? iterator.bind(context) : Prototype.K;
+            +     iterator = iterator || Prototype.K;
                   var result;
                   this.each(function(value, index) {
-            -       value = iterator(value, index);
+            +       value = iterator.call(context, value, index);
                     if (result == null || value >= result)
                       result = value;
                   });
                   return result;
                 },
                 min: function(iterator, context) {
-            -     iterator = iterator ? iterator.bind(context) : Prototype.K;
+            +     iterator = iterator || Prototype.K;
                   var result;
                   this.each(function(value, index) {
-            -       value = iterator(value, index);
+            +       value = iterator.call(context, value, index);
                     if (result == null || value < result)
                       result = value;
                   });
                   return result;
                 },
                 partition: function(iterator, context) {
-            -     iterator = iterator ? iterator.bind(context) : Prototype.K;
+            +     iterator = iterator || Prototype.K;
                   var trues = [], falses = [];
                   this.each(function(value, index) {
-            -       (iterator(value, index) ?
+            +       (iterator.call(context, value, index) ?
                       trues : falses).push(value);
                   });
                   return [trues, falses];
                 },
                 pluck: function(property) {
                   var results = [];
                   this.each(function(value) {
                     results.push(value[property]);
                   });
                   return results;
                 },
                 reject: function(iterator, context) {
-            -     iterator = iterator.bind(context);
                   var results = [];
                   this.each(function(value, index) {
-            -       if (!iterator(value, index))
+            +       if (!iterator.call(context, value, index))
                       results.push(value);
                   });
                   return results;
                 },
                 sortBy: function(iterator, context) {
-            -     iterator = iterator.bind(context);
                   return this.map(function(value, index) {
-            -       return {value: value, criteria: iterator(value, index)};
+            +       return {
+            +         value: value,
+            +         criteria: iterator.call(context, value, index)
+            +       };
                   }).sort(function(left, right) {
                     var a = left.criteria, b = right.criteria;
                     return a < b ? -1 : a > b ? 1 : 0;
                   }).pluck('value');
                 },
                 toArray: function() {
                   return this.map();
                 },
                 zip: function() {
                   var iterator = Prototype.K, args = $A(arguments);
                   if (Object.isFunction(args.last()))
                     iterator = args.pop();
                   var collections = [this].concat(args).map($A);
                   return this.map(function(value, index) {
                     return iterator(collections.pluck(index));
                   });
                 },
                 size: function() {
                   return this.toArray().length;
                 },
                 inspect: function() {
                   return '#<Enumerable:' + this.toArray().inspect() + '>';
                 }
               };
               Object.extend(Enumerable, {
                 map:     Enumerable.collect,
                 find:    Enumerable.detect,
                 select:  Enumerable.findAll,
                 filter:  Enumerable.findAll,
                 member:  Enumerable.include,
                 entries: Enumerable.toArray,
                 every:   Enumerable.all,
                 some:    Enumerable.any
               });
               function $A(iterable) {
                 if (!iterable) return [];
                 if (iterable.toArray) return iterable.toArray();
-            -   var length = iterable.length, results = new Array(length);
+            +   var length = iterable.length || 0, results = new Array(length);
                 while (length--) results[length] = iterable[length];
                 return results;
               }
               if (Prototype.Browser.WebKit) {
-            -   function $A(iterable) {
+            +   $A = function(iterable) {
                   if (!iterable) return [];
-            -     if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
+            +     // In Safari, only use the `toArray` method if it's not a NodeList.
-            -         iterable.toArray) return iterable.toArray();
+            +     // A NodeList is a function, has an function `item` property, and a numeric
-            -     var length = iterable.length, results = new Array(length);
+            +     // `length` property. Adapted from Google Doctype.
+            +     if (!(typeof iterable === 'function' && typeof iterable.length ===
+            +         'number' && typeof iterable.item === 'function') && iterable.toArray)
+            +       return iterable.toArray();
+            +     var length = iterable.length || 0, results = new Array(length);
                   while (length--) results[length] = iterable[length];
                   return results;
-            -   }
+            +   };
               }
               Array.from = $A;
               Object.extend(Array.prototype, Enumerable);
               if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
               Object.extend(Array.prototype, {
                 _each: function(iterator) {
                   for (var i = 0, length = this.length; i < length; i++)
                     iterator(this[i]);
                 },
                 clear: function() {
                   this.length = 0;
                   return this;
                 },
                 first: function() {
                   return this[0];
                 },
                 last: function() {
                   return this[this.length - 1];
                 },
                 compact: function() {
                   return this.select(function(value) {
                     return value != null;
                   });
                 },
                 flatten: function() {
                   return this.inject([], function(array, value) {
                     return array.concat(Object.isArray(value) ?
                       value.flatten() : [value]);
                   });
                 },
                 without: function() {
                   var values = $A(arguments);
                   return this.select(function(value) {
                     return !values.include(value);
                   });
                 },
                 reverse: function(inline) {
               if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
                 i || (i = 0);
                 var length = this.length;
                 if (i < 0) i = length + i;
                 for (; i < length; i++)
                   if (this[i] === item) return i;
                 return -1;
               };
               if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
                 i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
                 var n = this.slice(0, i).reverse().indexOf(item);
                 return (n < 0) ? n : i - n - 1;
               };
               Array.prototype.toArray = Array.prototype.clone;
               function $w(string) {
                 if (!Object.isString(string)) return [];
                 string = string.strip();
                 return string ? string.split(/\s+/) : [];
               }
               if (Prototype.Browser.Opera){
                 Array.prototype.concat = function() {
                   var array = [];
                   for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
                   for (var i = 0, length = arguments.length; i < length; i++) {
                     if (Object.isArray(arguments[i])) {
                       for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
                         array.push(arguments[i][j]);
                     } else {
                       array.push(arguments[i]);
                     }
                   }
                   return array;
                 };
               }
               Object.extend(Number.prototype, {
                 toColorPart: function() {
                   return this.toPaddedString(2, 16);
                 },
                 succ: function() {
                   return this + 1;
                 },
-            -   times: function(iterator) {
+            +   times: function(iterator, context) {
-            -     $R(0, this, true).each(iterator);
+            +     $R(0, this, true).each(iterator, context);
                   return this;
                 },
                 toPaddedString: function(length, radix) {
                   var string = this.toString(radix || 10);
                   return '0'.times(length - string.length) + string;
                 },
                 toJSON: function() {
                   return isFinite(this) ? this.toString() : 'null';
                 }
               });
               $w('abs round ceil floor').each(function(method){
                 Number.prototype[method] = Math[method].methodize();
               });
               function $H(object) {
                 return new Hash(object);
               };
               var Hash = Class.create(Enumerable, (function() {
                 function toQueryPair(key, value) {
                   if (Object.isUndefined(value)) return key;
                   return key + '=' + encodeURIComponent(String.interpret(value));
                 }
                 return {
                   initialize: function(object) {
                     this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
                   },
                   _each: function(iterator) {
                     for (var key in this._object) {
                       var value = this._object[key], pair = [key, value];
                       pair.key = key;
                       pair.value = value;
                       iterator(pair);
                     }
                   },
                   set: function(key, value) {
                     return this._object[key] = value;
                   },
                   get: function(key) {
+            +       // simulating poorly supported hasOwnProperty
+            +       if (this._object[key] !== Object.prototype[key])
                       return this._object[key];
                   },
                   unset: function(key) {
                     var value = this._object[key];
                     delete this._object[key];
                     return value;
                   },
                   toObject: function() {
                     return Object.clone(this._object);
                   },
                   keys: function() {
                     return this.pluck('key');
                   },
                   values: function() {
                     return this.pluck('value');
                   },
                   index: function(value) {
                     var match = this.detect(function(pair) {
                       return pair.value === value;
                     });
                     return match && match.key;
                   },
                   merge: function(object) {
                     return this.clone().update(object);
                   },
                   update: function(object) {
                     return new Hash(object).inject(this, function(result, pair) {
                       result.set(pair.key, pair.value);
                       return result;
                     });
                   },
                   toQueryString: function() {
-            -       return this.map(function(pair) {
+            +       return this.inject([], function(results, pair) {
                       var key = encodeURIComponent(pair.key), values = pair.value;
                       if (values && typeof values == 'object') {
                         if (Object.isArray(values))
-            -             return values.map(toQueryPair.curry(key)).join('&');
+            +             return results.concat(values.map(toQueryPair.curry(key)));
-            -         }
+            +         } else results.push(toQueryPair(key, values));
-            -         return toQueryPair(key, values);
+            +         return results;
                     }).join('&');
                   },
                   inspect: function() {
                     return '#<Hash:{' + this.map(function(pair) {
                       return pair.map(Object.inspect).join(': ');
                     }).join(', ') + '}>';
                   },
                   toJSON: function() {
                     return Object.toJSON(this.toObject());
                   },
                   clone: function() {
                     return new Hash(this);
                   }
                 }
               })());
               Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
               Hash.from = $H;
               var ObjectRange = Class.create(Enumerable, {
                 initialize: function(start, end, exclusive) {
                   this.start = start;
                   this.end = end;
                   this.exclusive = exclusive;
                 },
                 _each: function(iterator) {
                   var value = this.start;
                   while (this.include(value)) {
                     iterator(value);
                     value = value.succ();
                   }
                 },
                 include: function(value) {
                   if (value < this.start)
                     return false;
                   if (this.exclusive)
                     return value < this.end;
                   return value <= this.end;
                 }
               });
               var $R = function(start, end, exclusive) {
                 return new ObjectRange(start, end, exclusive);
               };
                      * Content-length header. See Mozilla Bugzilla #246651.
                      */
                     if (this.transport.overrideMimeType &&
                         (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
                           headers['Connection'] = 'close';
                   }
                   // user-defined headers
                   if (typeof this.options.requestHeaders == 'object') {
                     var extras = this.options.requestHeaders;
                     if (Object.isFunction(extras.push))
                       for (var i = 0, length = extras.length; i < length; i += 2)
                         headers[extras[i]] = extras[i+1];
                     else
                       $H(extras).each(function(pair) { headers[pair.key] = pair.value });
                   }
                   for (var name in headers)
                     this.transport.setRequestHeader(name, headers[name]);
                 },
                 success: function() {
                   var status = this.getStatus();
                   return !status || (status >= 200 && status < 300);
                 },
                 getStatus: function() {
                   try {
                     return this.transport.status || 0;
                   } catch (e) { return 0 }
                 },
                 respondToReadyState: function(readyState) {
                   var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
                   if (state == 'Complete') {
                     try {
                       this._complete = true;
                       (this.options['on' + response.status]
                        || this.options['on' + (this.success() ? 'Success' : 'Failure')]
                        || Prototype.emptyFunction)(response, response.headerJSON);
                     } catch (e) {
                       this.dispatchException(e);
                     }
                     var contentType = response.getHeader('Content-type');
                     if (this.options.evalJS == 'force'
-            -           || (this.options.evalJS && contentType
+            +           || (this.options.evalJS && this.isSameOrigin() && contentType
                         && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
                       this.evalResponse();
                   }
                   try {
                     (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
                     Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
                   } catch (e) {
                     this.dispatchException(e);
                   }
                   if (state == 'Complete') {
                     // avoid memory leak in MSIE: clean up
                     this.transport.onreadystatechange = Prototype.emptyFunction;
                   }
                 },
+            +   isSameOrigin: function() {
+            +     var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
+            +     return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
+            +       protocol: location.protocol,
+            +       domain: document.domain,
+            +       port: location.port ? ':' + location.port : ''
+            +     }));
+            +   },
+            +
                 getHeader: function(name) {
                   try {
-            -       return this.transport.getResponseHeader(name);
+            +       return this.transport.getResponseHeader(name) || null;
                   } catch (e) { return null }
                 },
                 evalResponse: function() {
                   try {
                     return eval((this.transport.responseText || '').unfilterJSON());
                   } catch (e) {
                     this.dispatchException(e);
                   }
                 },
                 dispatchException: function(exception) {
                   (this.options.onException || Prototype.emptyFunction)(this, exception);
                   Ajax.Responders.dispatch('onException', this, exception);
                 }
               });
               Ajax.Request.Events =
                 ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
               Ajax.Response = Class.create({
                 initialize: function(request){
                   this.request = request;
                   var transport  = this.transport  = request.transport,
                       readyState = this.readyState = transport.readyState;
                   if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
                     this.status       = this.getStatus();
                     this.statusText   = this.getStatusText();
                     this.responseText = String.interpret(transport.responseText);
                     this.headerJSON   = this._getHeaderJSON();
                   }
                   if(readyState == 4) {
                     var xml = transport.responseXML;
                     this.responseXML  = Object.isUndefined(xml) ? null : xml;
                     this.responseJSON = this._getResponseJSON();
                   }
                 },
                 status:      0,
                 statusText: '',
                 getStatus: Ajax.Request.prototype.getStatus,
                 getStatusText: function() {
                   try {
                     return this.transport.statusText || '';
                   } catch (e) { return '' }
                 },
                 getHeader: Ajax.Request.prototype.getHeader,
                 getAllHeaders: function() {
                   try {
                     return this.getAllResponseHeaders();
                   } catch (e) { return null }
                 },
                 getResponseHeader: function(name) {
                   return this.transport.getResponseHeader(name);
                 },
                 getAllResponseHeaders: function() {
                   return this.transport.getAllResponseHeaders();
                 },
                 _getHeaderJSON: function() {
                   var json = this.getHeader('X-JSON');
                   if (!json) return null;
                   json = decodeURIComponent(escape(json));
                   try {
-            -       return json.evalJSON(this.request.options.sanitizeJSON);
+            +       return json.evalJSON(this.request.options.sanitizeJSON ||
+            +         !this.request.isSameOrigin());
                   } catch (e) {
                     this.request.dispatchException(e);
                   }
                 },
                 _getResponseJSON: function() {
                   var options = this.request.options;
                   if (!options.evalJSON || (options.evalJSON != 'force' &&
                     !(this.getHeader('Content-type') || '').include('application/json')) ||
                       this.responseText.blank())
                         return null;
                   try {
-            -       return this.responseText.evalJSON(options.sanitizeJSON);
+            +       return this.responseText.evalJSON(options.sanitizeJSON ||
+            +         !this.request.isSameOrigin());
                   } catch (e) {
                     this.request.dispatchException(e);
                   }
                 }
               });
               Ajax.Updater = Class.create(Ajax.Request, {
                 initialize: function($super, container, url, options) {
                   this.container = {
                     success: (container.success || container),
                     failure: (container.failure || (container.success ? null : container))
                   };
                   options = Object.clone(options);
                   var onComplete = options.onComplete;
                   options.onComplete = (function(response, json) {
                     this.updateContent(response.responseText);
                     if (Object.isFunction(onComplete)) onComplete(response, json);
                   }).bind(this);
                   $super(url, options);
                 },
                 updateContent: function(responseText) {
                   var receiver = this.container[this.success() ? 'success' : 'failure'],
                       options = this.options;
                   if (!options.evalScripts) responseText = responseText.stripScripts();
                   if (receiver = $(receiver)) {
                     if (options.insertion) {
                       if (Object.isString(options.insertion)) {
                         var insertion = { }; insertion[options.insertion] = responseText;
                         receiver.insert(insertion);
                       }
                       else options.insertion(receiver, responseText);
                     }
                     else receiver.update(responseText);
                   }
                 }
               });
               Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
                 initialize: function($super, container, url, options) {
                   $super(options);
                   this.onComplete = this.options.onComplete;
                   this.frequency = (this.options.frequency || 2);
               if (Prototype.BrowserFeatures.XPath) {
                 document._getElementsByXPath = function(expression, parentElement) {
                   var results = [];
                   var query = document.evaluate(expression, $(parentElement) || document,
                     null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
                   for (var i = 0, length = query.snapshotLength; i < length; i++)
                     results.push(Element.extend(query.snapshotItem(i)));
                   return results;
                 };
               }
               /*--------------------------------------------------------------------------*/
               if (!window.Node) var Node = { };
               if (!Node.ELEMENT_NODE) {
                 // DOM level 2 ECMAScript Language Binding
                 Object.extend(Node, {
                   ELEMENT_NODE: 1,
                   ATTRIBUTE_NODE: 2,
                   TEXT_NODE: 3,
                   CDATA_SECTION_NODE: 4,
                   ENTITY_REFERENCE_NODE: 5,
                   ENTITY_NODE: 6,
                   PROCESSING_INSTRUCTION_NODE: 7,
                   COMMENT_NODE: 8,
                   DOCUMENT_NODE: 9,
                   DOCUMENT_TYPE_NODE: 10,
                   DOCUMENT_FRAGMENT_NODE: 11,
                   NOTATION_NODE: 12
                 });
               }
               (function() {
                 var element = this.Element;
                 this.Element = function(tagName, attributes) {
                   attributes = attributes || { };
                   tagName = tagName.toLowerCase();
                   var cache = Element.cache;
                   if (Prototype.Browser.IE && attributes.name) {
                     tagName = '<' + tagName + ' name="' + attributes.name + '">';
                     delete attributes.name;
                     return Element.writeAttribute(document.createElement(tagName), attributes);
                   }
                   if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
                   return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
                 };
                 Object.extend(this.Element, element || { });
+            +   if (element) this.Element.prototype = element.prototype;
               }).call(window);
               Element.cache = { };
               Element.Methods = {
                 visible: function(element) {
                   return $(element).style.display != 'none';
                 },
                 toggle: function(element) {
                   element = $(element);
                   Element[Element.visible(element) ? 'hide' : 'show'](element);
                   return element;
                 },
                 hide: function(element) {
-            -     $(element).style.display = 'none';
+            +     element = $(element);
+            +     element.style.display = 'none';
                   return element;
                 },
                 show: function(element) {
-            -     $(element).style.display = '';
+            +     element = $(element);
+            +     element.style.display = '';
                   return element;
                 },
                 remove: function(element) {
                   element = $(element);
                   element.parentNode.removeChild(element);
                   return element;
                 },
                 update: function(element, content) {
                   element = $(element);
                   if (content && content.toElement) content = content.toElement();
                   if (Object.isElement(content)) return element.update().insert(content);
                   content = Object.toHTML(content);
                   element.innerHTML = content.stripScripts();
                   content.evalScripts.bind(content).defer();
                   return element;
                 },
                 replace: function(element, content) {
                   element = $(element);
                   if (content && content.toElement) content = content.toElement();
                   else if (!Object.isElement(content)) {
                     content = Object.toHTML(content);
                     var range = element.ownerDocument.createRange();
                     range.selectNode(element);
                     content.evalScripts.bind(content).defer();
                     content = range.createContextualFragment(content.stripScripts());
                   }
                   element.parentNode.replaceChild(content, element);
                   return element;
                 },
                 insert: function(element, insertions) {
                   element = $(element);
                   if (Object.isString(insertions) || Object.isNumber(insertions) ||
                       Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
                         insertions = {bottom:insertions};
-            -     var content, t, range;
+            +     var content, insert, tagName, childNodes;
+            +
-            -     for (position in insertions) {
+            +     for (var position in insertions) {
                     content  = insertions[position];
                     position = position.toLowerCase();
-            -       t = Element._insertionTranslations[position];
+            +       insert = Element._insertionTranslations[position];
                     if (content && content.toElement) content = content.toElement();
                     if (Object.isElement(content)) {
-            -         t.insert(element, content);
+            +         insert(element, content);
                       continue;
                     }
                     content = Object.toHTML(content);
-            -       range = element.ownerDocument.createRange();
+            +       tagName = ((position == 'before' || position == 'after')
-            -       t.initializeRange(element, range);
+            +         ? element.parentNode : element).tagName.toUpperCase();
-            -       t.insert(element, range.createContextualFragment(content.stripScripts()));
+            +       childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+            +
+            +       if (position == 'top' || position == 'after') childNodes.reverse();
+            +       childNodes.each(insert.curry(element));
                     content.evalScripts.bind(content).defer();
                   }
                   return element;
                 },
                 wrap: function(element, wrapper, attributes) {
                   element = $(element);
                   if (Object.isElement(wrapper))
                     $(wrapper).writeAttribute(attributes || { });
                   else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
                   else wrapper = new Element('div', wrapper);
                   if (element.parentNode)
                     element.parentNode.replaceChild(wrapper, element);
                   wrapper.appendChild(element);
                   return wrapper;
                 },
                 inspect: function(element) {
                   element = $(element);
                   var result = '<' + element.tagName.toLowerCase();
                   $H({'id': 'id', 'className': 'class'}).each(function(pair) {
                     var property = pair.first(), attribute = pair.last();
                     var value = (element[property] || '').toString();
                     if (value) result += ' ' + attribute + '=' + value.inspect(true);
                   });
                   return result + '>';
                 },
                 recursivelyCollect: function(element, property) {
                   element = $(element);
                   var elements = [];
                   while (element = element[property])
                     if (element.nodeType == 1)
                       elements.push(Element.extend(element));
                   return elements;
                 },
                 ancestors: function(element) {
                   return $(element).recursivelyCollect('parentNode');
                 },
                 descendants: function(element) {
-            -     return $(element).getElementsBySelector("*");
+            +     return $(element).select("*");
                 },
                 firstDescendant: function(element) {
                   element = $(element).firstChild;
                   while (element && element.nodeType != 1) element = element.nextSibling;
                   return $(element);
                 },
                 immediateDescendants: function(element) {
                   if (!(element = $(element).firstChild)) return [];
                   while (element && element.nodeType != 1) element = element.nextSibling;
                   if (element) return [element].concat($(element).nextSiblings());
                   return [];
                 },
                 previousSiblings: function(element) {
                   return $(element).recursivelyCollect('previousSibling');
                 },
                 nextSiblings: function(element) {
                   return $(element).recursivelyCollect('nextSibling');
                 },
                 siblings: function(element) {
                   element = $(element);
                   return element.previousSiblings().reverse().concat(element.nextSiblings());
                 },
                 match: function(element, selector) {
                   if (Object.isString(selector))
                     selector = new Selector(selector);
                   return selector.match($(element));
                 },
                 up: function(element, expression, index) {
                   element = $(element);
                   if (arguments.length == 1) return $(element.parentNode);
                   var ancestors = element.ancestors();
-            -     return expression ? Selector.findElement(ancestors, expression, index) :
+            +     return Object.isNumber(expression) ? ancestors[expression] :
-            -       ancestors[index || 0];
+            +       Selector.findElement(ancestors, expression, index);
                 },
                 down: function(element, expression, index) {
                   element = $(element);
                   if (arguments.length == 1) return element.firstDescendant();
-            -     var descendants = element.descendants();
+            +     return Object.isNumber(expression) ? element.descendants()[expression] :
-            -     return expression ? Selector.findElement(descendants, expression, index) :
+            +       Element.select(element, expression)[index || 0];
-            -       descendants[index || 0];
                 },
                 previous: function(element, expression, index) {
                   element = $(element);
                   if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
                   var previousSiblings = element.previousSiblings();
-            -     return expression ? Selector.findElement(previousSiblings, expression, index) :
+            +     return Object.isNumber(expression) ? previousSiblings[expression] :
-            -       previousSiblings[index || 0];
+            +       Selector.findElement(previousSiblings, expression, index);
                 },
                 next: function(element, expression, index) {
                   element = $(element);
                   if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
                   var nextSiblings = element.nextSiblings();
-            -     return expression ? Selector.findElement(nextSiblings, expression, index) :
+            +     return Object.isNumber(expression) ? nextSiblings[expression] :
-            -       nextSiblings[index || 0];
+            +       Selector.findElement(nextSiblings, expression, index);
                 },
                 select: function() {
                   var args = $A(arguments), element = $(args.shift());
                   return Selector.findChildElements(element, args);
                 },
                 adjacent: function() {
                   var args = $A(arguments), element = $(args.shift());
                   return Selector.findChildElements(element.parentNode, args).without(element);
                 },
                 identify: function(element) {
                   element = $(element);
                   var id = element.readAttribute('id'), self = arguments.callee;
                   if (id) return id;
                   do { id = 'anonymous_element_' + self.counter++ } while ($(id));
                   element.writeAttribute('id', id);
                   return id;
                 },
                 readAttribute: function(element, name) {
                   element = $(element);
                   if (Prototype.Browser.IE) {
                     var t = Element._attributeTranslations.read;
                     if (t.values[name]) return t.values[name](element, name);
                     if (t.names[name]) name = t.names[name];
                     if (name.include(':')) {
                       return (!element.attributes || !element.attributes[name]) ? null :
                        element.attributes[name].value;
                     }
                   }
                   return element.getAttribute(name);
                 },
                 writeAttribute: function(element, name, value) {
                   element = $(element);
                   var attributes = { }, t = Element._attributeTranslations.write;
                   if (typeof name == 'object') attributes = name;
                   else attributes[name] = Object.isUndefined(value) ? true : value;
                   for (var attr in attributes) {
                     name = t.names[attr] || attr;
                     value = attributes[attr];
                     if (t.values[attr]) name = t.values[attr](element, value);
                     if (value === false || value === null)
                       element.removeAttribute(name);
                 },
                 hasClassName: function(element, className) {
                   if (!(element = $(element))) return;
                   var elementClassName = element.className;
                   return (elementClassName.length > 0 && (elementClassName == className ||
                     new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
                 },
                 addClassName: function(element, className) {
                   if (!(element = $(element))) return;
                   if (!element.hasClassName(className))
                     element.className += (element.className ? ' ' : '') + className;
                   return element;
                 },
                 removeClassName: function(element, className) {
                   if (!(element = $(element))) return;
                   element.className = element.className.replace(
                     new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
                   return element;
                 },
                 toggleClassName: function(element, className) {
                   if (!(element = $(element))) return;
                   return element[element.hasClassName(className) ?
                     'removeClassName' : 'addClassName'](className);
                 },
                 // removes whitespace-only text node children
                 cleanWhitespace: function(element) {
                   element = $(element);
                   var node = element.firstChild;
                   while (node) {
                     var nextNode = node.nextSibling;
                     if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
                       element.removeChild(node);
                     node = nextNode;
                   }
                   return element;
                 },
                 empty: function(element) {
                   return $(element).innerHTML.blank();
                 },
                 descendantOf: function(element, ancestor) {
                   element = $(element), ancestor = $(ancestor);
-            -     var originalAncestor = ancestor;
                   if (element.compareDocumentPosition)
                     return (element.compareDocumentPosition(ancestor) & 8) === 8;
-            -     if (element.sourceIndex && !Prototype.Browser.Opera) {
+            +     if (ancestor.contains)
-            -       var e = element.sourceIndex, a = ancestor.sourceIndex,
+            +       return ancestor.contains(element) && ancestor !== element;
-            -        nextAncestor = ancestor.nextSibling;
-            -       if (!nextAncestor) {
-            -         do { ancestor = ancestor.parentNode; }
-            -         while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-            -       }
-            -       if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
-            -     }
                   while (element = element.parentNode)
-            -       if (element == originalAncestor) return true;
+            +       if (element == ancestor) return true;
+            +
                   return false;
                 },
                 scrollTo: function(element) {
                   element = $(element);
                   var pos = element.cumulativeOffset();
                   window.scrollTo(pos[0], pos[1]);
                   return element;
                 },
                 getStyle: function(element, style) {
                   element = $(element);
                   style = style == 'float' ? 'cssFloat' : style.camelize();
                   var value = element.style[style];
-            -     if (!value) {
+            +     if (!value || value == 'auto') {
                     var css = document.defaultView.getComputedStyle(element, null);
                     value = css ? css[style] : null;
                   }
                   if (style == 'opacity') return value ? parseFloat(value) : 1.0;
                   return value == 'auto' ? null : value;
                 },
                 getOpacity: function(element) {
                   return $(element).getStyle('opacity');
                 },
                 setStyle: function(element, styles) {
                   element = $(element);
                   var elementStyle = element.style, match;
                   if (Object.isString(styles)) {
                     element.style.cssText += ';' + styles;
                     return styles.include('opacity') ?
                       element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
                   }
                   for (var property in styles)
                     if (property == 'opacity') element.setOpacity(styles[property]);
                     else
                       elementStyle[(property == 'float' || property == 'cssFloat') ?
                         (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
                           property] = styles[property];
                   return element;
                 },
                 setOpacity: function(element, value) {
                   element = $(element);
                   element.style.opacity = (value == 1 || value === '') ? '' :
                     (value < 0.00001) ? 0 : value;
                   return element;
                 },
                 getDimensions: function(element) {
                   element = $(element);
-            -     var display = $(element).getStyle('display');
+            +     var display = element.getStyle('display');
                   if (display != 'none' && display != null) // Safari bug
                     return {width: element.offsetWidth, height: element.offsetHeight};
                   // All *Width and *Height properties give 0 on elements with display none,
                   // so enable the element temporarily
                   var els = element.style;
                   var originalVisibility = els.visibility;
                   var originalPosition = els.position;
                   var originalDisplay = els.display;
                   els.visibility = 'hidden';
                   els.position = 'absolute';
                   els.display = 'block';
                   var originalWidth = element.clientWidth;
                   var originalHeight = element.clientHeight;
                   els.display = originalDisplay;
                   els.position = originalPosition;
                   els.visibility = originalVisibility;
                   return {width: originalWidth, height: originalHeight};
                 },
                 makePositioned: function(element) {
                   element = $(element);
                   var pos = Element.getStyle(element, 'position');
                   if (pos == 'static' || !pos) {
                     element._madePositioned = true;
                     element.style.position = 'relative';
                     // Opera returns the offset relative to the positioning context, when an
                     // element is position relative but top and left have not been defined
-            -       if (window.opera) {
+            +       if (Prototype.Browser.Opera) {
                       element.style.top = 0;
                       element.style.left = 0;
                     }
                   }
                   return element;
                 },
                 undoPositioned: function(element) {
                   element = $(element);
                   if (element._madePositioned) {
                     element._madePositioned = undefined;
                     element.style.position =
                       element.style.top =
                       element.style.left =
                       element.style.bottom =
                       element.style.right = '';
                   }
                   return element;
                 },
                 makeClipping: function(element) {
                   element = $(element);
                   if (element._overflow) return element;
                   element._overflow = Element.getStyle(element, 'overflow') || 'auto';
                   if (element._overflow !== 'hidden')
                     element.style.overflow = 'hidden';
                   return element;
                 },
                 undoClipping: function(element) {
                   element = $(element);
                   if (!element._overflow) return element;
                   element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
                   element._overflow = null;
                   return element;
                 },
                 cumulativeOffset: function(element) {
                   var valueT = 0, valueL = 0;
                   do {
                     valueT += element.offsetTop  || 0;
                     valueL += element.offsetLeft || 0;
                     element = element.offsetParent;
                   } while (element);
                   return Element._returnOffset(valueL, valueT);
                 },
                 positionedOffset: function(element) {
                   var valueT = 0, valueL = 0;
                   do {
                     valueT += element.offsetTop  || 0;
                     valueL += element.offsetLeft || 0;
                     element = element.offsetParent;
                     if (element) {
-            -         if (element.tagName == 'BODY') break;
+            +         if (element.tagName.toUpperCase() == 'BODY') break;
                       var p = Element.getStyle(element, 'position');
-            -         if (p == 'relative' || p == 'absolute') break;
+            +         if (p !== 'static') break;
                     }
                   } while (element);
                   return Element._returnOffset(valueL, valueT);
                 },
                 absolutize: function(element) {
                   element = $(element);
-            -     if (element.getStyle('position') == 'absolute') return;
+            +     if (element.getStyle('position') == 'absolute') return element;
                   // Position.prepare(); // To be done manually by Scripty when it needs it.
                   var offsets = element.positionedOffset();
                   var top     = offsets[1];
                   var left    = offsets[0];
                   var width   = element.clientWidth;
                   var height  = element.clientHeight;
                   element._originalLeft   = left - parseFloat(element.style.left  || 0);
                   element._originalTop    = top  - parseFloat(element.style.top || 0);
                   element._originalWidth  = element.style.width;
                   element._originalHeight = element.style.height;
                   element.style.position = 'absolute';
                   element.style.top    = top + 'px';
                   element.style.left   = left + 'px';
                   element.style.width  = width + 'px';
                   element.style.height = height + 'px';
                   return element;
                 },
                 relativize: function(element) {
                   element = $(element);
-            -     if (element.getStyle('position') == 'relative') return;
+            +     if (element.getStyle('position') == 'relative') return element;
                   // Position.prepare(); // To be done manually by Scripty when it needs it.
                   element.style.position = 'relative';
                   var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
                   var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
                   element.style.top    = top + 'px';
                   element.style.left   = left + 'px';
                   element.style.height = element._originalHeight;
                   element.style.width  = element._originalWidth;
                   return element;
                 },
                 cumulativeScrollOffset: function(element) {
                   var valueT = 0, valueL = 0;
                   do {
                     valueT += element.scrollTop  || 0;
                     valueL += element.scrollLeft || 0;
                     element = element.parentNode;
                   } while (element);
                   return Element._returnOffset(valueL, valueT);
                 },
                 getOffsetParent: function(element) {
                   if (element.offsetParent) return $(element.offsetParent);
                   if (element == document.body) return $(element);
                   while ((element = element.parentNode) && element != document.body)
                     if (Element.getStyle(element, 'position') != 'static')
                       return $(element);
                   return $(document.body);
                 },
                 viewportOffset: function(forElement) {
                   var valueT = 0, valueL = 0;
                   var element = forElement;
                   do {
                     valueT += element.offsetTop  || 0;
                     valueL += element.offsetLeft || 0;
                     // Safari fix
                     if (element.offsetParent == document.body &&
                       Element.getStyle(element, 'position') == 'absolute') break;
                   } while (element = element.offsetParent);
                   element = forElement;
                   do {
-            -       if (!Prototype.Browser.Opera || element.tagName == 'BODY') {
+            +       if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) {
                       valueT -= element.scrollTop  || 0;
                       valueL -= element.scrollLeft || 0;
                     }
                   } while (element = element.parentNode);
                   return Element._returnOffset(valueL, valueT);
                 },
                 clonePosition: function(element, source) {
                   var options = Object.extend({
                     setLeft:    true,
                     setTop:     true,
                     setWidth:   true,
                     setHeight:  true,
                     offsetTop:  0,
                     offsetLeft: 0
                   }, arguments[2] || { });
                   // find page position of source
                   source = $(source);
                   var p = source.viewportOffset();
                   // find coordinate system to use
                   element = $(element);
                   var delta = [0, 0];
                   var parent = null;
                   // delta [0,0] will do fine with position: fixed elements,
                   // position:absolute needs offsetParent deltas
                   if (Element.getStyle(element, 'position') == 'absolute') {
                     parent = element.getOffsetParent();
                     delta = parent.viewportOffset();
                   }
                   // correct by body offsets (fixes Safari)
                   if (parent == document.body) {
                     delta[0] -= document.body.offsetLeft;
                     delta[1] -= document.body.offsetTop;
                   }
                   // set position
                   if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
                   if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
                   if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
                   if (options.setHeight) element.style.height = source.offsetHeight + 'px';
                   return element;
                 }
               };
               Element.Methods.identify.counter = 1;
               Object.extend(Element.Methods, {
                 getElementsBySelector: Element.Methods.select,
                 childElements: Element.Methods.immediateDescendants
               });
               Element._attributeTranslations = {
                 write: {
                   names: {
                     className: 'class',
                     htmlFor:   'for'
                   },
                   values: { }
                 }
               };
-            - if (!document.createRange || Prototype.Browser.Opera) {
-            -   Element.Methods.insert = function(element, insertions) {
-            -     element = $(element);
-            -     if (Object.isString(insertions) || Object.isNumber(insertions) ||
-            -         Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-            -           insertions = { bottom: insertions };
-            -     var t = Element._insertionTranslations, content, position, pos, tagName;
-            -     for (position in insertions) {
-            -       content  = insertions[position];
-            -       position = position.toLowerCase();
-            -       pos      = t[position];
-            -       if (content && content.toElement) content = content.toElement();
-            -       if (Object.isElement(content)) {
-            -         pos.insert(element, content);
-            -         continue;
-            -       }
-            -       content = Object.toHTML(content);
-            -       tagName = ((position == 'before' || position == 'after')
-            -         ? element.parentNode : element).tagName.toUpperCase();
-            -       if (t.tags[tagName]) {
-            -         var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-            -         if (position == 'top' || position == 'after') fragments.reverse();
-            -         fragments.each(pos.insert.curry(element));
-            -       }
-            -       else element.insertAdjacentHTML(pos.adjacency, content.stripScripts());
-            -       content.evalScripts.bind(content).defer();
-            -     }
-            -     return element;
-            -   };
-            - }
               if (Prototype.Browser.Opera) {
                 Element.Methods.getStyle = Element.Methods.getStyle.wrap(
                   function(proceed, element, style) {
                     switch (style) {
                       case 'left': case 'top': case 'right': case 'bottom':
                         if (proceed(element, 'position') === 'static') return null;
                       case 'height': case 'width':
                         // returns '0px' for hidden elements; we want it to return null
                         if (!Element.visible(element)) return null;
                         // returns the border-box dimensions rather than the content-box
                         // dimensions, so we subtract padding and borders from the value
                         var dim = parseInt(proceed(element, style), 10);
                         if (dim !== element['offset' + style.capitalize()])
                           return dim + 'px';
                         var properties;
                         if (style === 'height') {
                           properties = ['border-top-width', 'padding-top',
                            'padding-bottom', 'border-bottom-width'];
                         }
                         else {
                           properties = ['border-left-width', 'padding-left',
                            'padding-right', 'border-right-width'];
                         }
                         return properties.inject(dim, function(memo, property) {
                           var val = proceed(element, property);
                           return val === null ? memo : memo - parseInt(val, 10);
                         }) + 'px';
                       default: return proceed(element, style);
                     }
                   }
                 );
                 Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
                   function(proceed, element, attribute) {
                     if (attribute === 'title') return element.title;
                     return proceed(element, attribute);
                   }
                 );
               }
               else if (Prototype.Browser.IE) {
-            -   $w('positionedOffset getOffsetParent viewportOffset').each(function(method) {
+            +   // IE doesn't report offsets correctly for static elements, so we change them
+            +   // to "relative" to get the values, then change them back.
+            +   Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap(
+            +     function(proceed, element) {
+            +       element = $(element);
+            +       // IE throws an error if element is not in document
+            +       try { element.offsetParent }
+            +       catch(e) { return $(document.body) }
+            +       var position = element.getStyle('position');
+            +       if (position !== 'static') return proceed(element);
+            +       element.setStyle({ position: 'relative' });
+            +       var value = proceed(element);
+            +       element.setStyle({ position: position });
+            +       return value;
+            +     }
+            +   );
+            +
+            +   $w('positionedOffset viewportOffset').each(function(method) {
                   Element.Methods[method] = Element.Methods[method].wrap(
                     function(proceed, element) {
                       element = $(element);
+            +         try { element.offsetParent }
+            +         catch(e) { return Element._returnOffset(0,0) }
                       var position = element.getStyle('position');
-            -         if (position != 'static') return proceed(element);
+            +         if (position !== 'static') return proceed(element);
+            +         // Trigger hasLayout on the offset parent so that IE6 reports
+            +         // accurate offsetTop and offsetLeft values for position: fixed.
+            +         var offsetParent = element.getOffsetParent();
+            +         if (offsetParent && offsetParent.getStyle('position') === 'fixed')
+            +           offsetParent.setStyle({ zoom: 1 });
                       element.setStyle({ position: 'relative' });
                       var value = proceed(element);
                       element.setStyle({ position: position });
                       return value;
                     }
                   );
                 });
+            +   Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
+            +     function(proceed, element) {
+            +       try { element.offsetParent }
+            +       catch(e) { return Element._returnOffset(0,0) }
+            +       return proceed(element);
+            +     }
+            +   );
+            +
                 Element.Methods.getStyle = function(element, style) {
                   element = $(element);
                   style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
                   var value = element.style[style];
                   if (!value && element.currentStyle) value = element.currentStyle[style];
                   if (style == 'opacity') {
                     if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
                       if (value[1]) return parseFloat(value[1]) / 100;
                     return 1.0;
                   }
                   if (value == 'auto') {
                     if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
                       return element['offset' + style.capitalize()] + 'px';
                     return null;
                   }
                   return value;
                 };
                 Element.Methods.setOpacity = function(element, value) {
                   function stripAlpha(filter){
                     return filter.replace(/alpha\([^\)]*\)/gi,'');
                   }
                   element = $(element);
                   var currentStyle = element.currentStyle;
                   if ((currentStyle && !currentStyle.hasLayout) ||
                     (!currentStyle && element.style.zoom == 'normal'))
                       element.style.zoom = 1;
                   var filter = element.getStyle('filter'), style = element.style;
                   if (value == 1 || value === '') {
                     (filter = stripAlpha(filter)) ?
                       style.filter = filter : style.removeAttribute('filter');
                     return element;
                   } else if (value < 0.00001) value = 0;
                   style.filter = stripAlpha(filter) +
                     'alpha(opacity=' + (value * 100) + ')';
                   return element;
                 };
                 Element._attributeTranslations = {
                   read: {
                     names: {
                       'class': 'className',
                       'for':   'htmlFor'
                     },
                     values: {
                       _getAttr: function(element, attribute) {
                         return element.getAttribute(attribute, 2);
                       },
                       _getAttrNode: function(element, attribute) {
                         var node = element.getAttributeNode(attribute);
                         return node ? node.value : "";
                       },
                       _getEv: function(element, attribute) {
                         attribute = element.getAttribute(attribute);
                         return attribute ? attribute.toString().slice(23, -2) : null;
                       },
                       _flag: function(element, attribute) {
                         return $(element).hasAttribute(attribute) ? attribute : null;
                       },
                       style: function(element) {
                         return element.style.cssText.toLowerCase();
                       },
                       title: function(element) {
                         return element.title;
                       }
                     }
                   }
                 };
                 Element._attributeTranslations.write = {
-            -     names: Object.clone(Element._attributeTranslations.read.names),
+            +     names: Object.extend({
+            +       cellpadding: 'cellPadding',
+            +       cellspacing: 'cellSpacing'
+            +     }, Element._attributeTranslations.read.names),
                   values: {
                     checked: function(element, value) {
                       element.checked = !!value;
                     },
                     style: function(element, value) {
                       element.style.cssText = value ? value : '';
                     }
                   }
                 };
                 Element._attributeTranslations.has = {};
                 $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
-            -       'encType maxLength readOnly longDesc').each(function(attr) {
+            +       'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
                   Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
                   Element._attributeTranslations.has[attr.toLowerCase()] = attr;
                 });
                 (function(v) {
                   Object.extend(v, {
                     href:        v._getAttr,
                     src:         v._getAttr,
                     type:        v._getAttr,
                     action:      v._getAttrNode,
                     disabled:    v._flag,
                     checked:     v._flag,
                     readonly:    v._flag,
                     multiple:    v._flag,
                     onload:      v._getEv,
                     onunload:    v._getEv,
                     onclick:     v._getEv,
                     ondblclick:  v._getEv,
                     onmousedown: v._getEv,
                     onmouseup:   v._getEv,
                     onmouseover: v._getEv,
                     onmousemove: v._getEv,
                     onmouseout:  v._getEv,
                     onfocus:     v._getEv,
                     onblur:      v._getEv,
                     onkeypress:  v._getEv,
                     onkeydown:   v._getEv,
                     onkeyup:     v._getEv,
                     onsubmit:    v._getEv,
                     onreset:     v._getEv,
                     onselect:    v._getEv,
                     onchange:    v._getEv
                   });
                 })(Element._attributeTranslations.read.values);
               }
               else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
                 Element.Methods.setOpacity = function(element, value) {
                   element = $(element);
                   element.style.opacity = (value == 1) ? 0.999999 :
                     (value === '') ? '' : (value < 0.00001) ? 0 : value;
                   return element;
                 };
               }
               else if (Prototype.Browser.WebKit) {
                 Element.Methods.setOpacity = function(element, value) {
                   element = $(element);
                   element.style.opacity = (value == 1 || value === '') ? '' :
                     (value < 0.00001) ? 0 : value;
                   if (value == 1)
-            -       if(element.tagName == 'IMG' && element.width) {
+            +       if(element.tagName.toUpperCase() == 'IMG' && element.width) {
                       element.width++; element.width--;
                     } else try {
                       var n = document.createTextNode(' ');
                       element.appendChild(n);
                       element.removeChild(n);
                     } catch (e) { }
                   return element;
                 };
                 // Safari returns margins on body which is incorrect if the child is absolutely
                 // positioned.  For performance reasons, redefine Element#cumulativeOffset for
                 // KHTML/WebKit only.
                 Element.Methods.cumulativeOffset = function(element) {
                   var valueT = 0, valueL = 0;
                   do {
                     valueT += element.offsetTop  || 0;
                     valueL += element.offsetLeft || 0;
                     if (element.offsetParent == document.body)
                       if (Element.getStyle(element, 'position') == 'absolute') break;
                     element = element.offsetParent;
                   } while (element);
                   return Element._returnOffset(valueL, valueT);
                 };
               }
               if (Prototype.Browser.IE || Prototype.Browser.Opera) {
                 // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
                 Element.Methods.update = function(element, content) {
                   element = $(element);
                   if (content && content.toElement) content = content.toElement();
                   if (Object.isElement(content)) return element.update().insert(content);
                   content = Object.toHTML(content);
                   var tagName = element.tagName.toUpperCase();
                   if (tagName in Element._insertionTranslations.tags) {
                     $A(element.childNodes).each(function(node) { element.removeChild(node) });
                     Element._getContentFromAnonymousElement(tagName, content.stripScripts())
                       .each(function(node) { element.appendChild(node) });
                   }
                   else element.innerHTML = content.stripScripts();
                   content.evalScripts.bind(content).defer();
                   return element;
                 };
               }
-            - if (document.createElement('div').outerHTML) {
+            + if ('outerHTML' in document.createElement('div')) {
                 Element.Methods.replace = function(element, content) {
                   element = $(element);
                   if (content && content.toElement) content = content.toElement();
                   if (Object.isElement(content)) {
                     element.parentNode.replaceChild(content, element);
                     return element;
                   }
                   content = Object.toHTML(content);
                   var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
                   if (Element._insertionTranslations.tags[tagName]) {
                     var nextSibling = element.next();
                     var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
                     parent.removeChild(element);
                     if (nextSibling)
                       fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
                     else
                       fragments.each(function(node) { parent.appendChild(node) });
                   }
                   else element.outerHTML = content.stripScripts();
                   content.evalScripts.bind(content).defer();
                   return element;
                 };
               }
               Element._returnOffset = function(l, t) {
                 var result = [l, t];
                 result.left = l;
                 result.top = t;
                 return result;
               };
               Element._getContentFromAnonymousElement = function(tagName, html) {
                 var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
+            +   if (t) {
                   div.innerHTML = t[0] + html + t[1];
                   t[2].times(function() { div = div.firstChild });
+            +   } else div.innerHTML = html;
                 return $A(div.childNodes);
               };
               Element._insertionTranslations = {
-            -   before: {
+            +   before: function(element, node) {
-            -     adjacency: 'beforeBegin',
-            -     insert: function(element, node) {
                   element.parentNode.insertBefore(node, element);
                 },
-            -     initializeRange: function(element, range) {
+            +   top: function(element, node) {
-            -       range.setStartBefore(element);
-            -     }
-            -   },
-            -   top: {
-            -     adjacency: 'afterBegin',
-            -     insert: function(element, node) {
                   element.insertBefore(node, element.firstChild);
                 },
-            -     initializeRange: function(element, range) {
+            +   bottom: function(element, node) {
-            -       range.selectNodeContents(element);
-            -       range.collapse(true);
-            -     }
-            -   },
-            -   bottom: {
-            -     adjacency: 'beforeEnd',
-            -     insert: function(element, node) {
                   element.appendChild(node);
-            -     }
+            +   },
-            -   },
+            +   after: function(element, node) {
-            -   after: {
-            -     adjacency: 'afterEnd',
-            -     insert: function(element, node) {
                   element.parentNode.insertBefore(node, element.nextSibling);
                 },
-            -     initializeRange: function(element, range) {
-            -       range.setStartAfter(element);
-            -     }
-            -   },
                 tags: {
                   TABLE:  ['<table>',                '</table>',                   1],
                   TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
                   TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
                   TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
                   SELECT: ['<select>',               '</select>',                  1]
                 }
               };
               (function() {
-            -   this.bottom.initializeRange = this.top.initializeRange;
                 Object.extend(this.tags, {
                   THEAD: this.tags.TBODY,
                   TFOOT: this.tags.TBODY,
                   TH:    this.tags.TD
                 });
               }).call(Element._insertionTranslations);
               Element.Methods.Simulated = {
                 hasAttribute: function(element, attribute) {
                   attribute = Element._attributeTranslations.has[attribute] || attribute;
                   var node = $(element).getAttributeNode(attribute);
-            -     return node && node.specified;
+            +     return !!(node && node.specified);
                 }
               };
               Element.Methods.ByTag = { };
               Object.extend(Element, Element.Methods);
               if (!Prototype.BrowserFeatures.ElementExtensions &&
-            -     document.createElement('div').__proto__) {
+            +     document.createElement('div')['__proto__']) {
                 window.HTMLElement = { };
-            -   window.HTMLElement.prototype = document.createElement('div').__proto__;
+            +   window.HTMLElement.prototype = document.createElement('div')['__proto__'];
                 Prototype.BrowserFeatures.ElementExtensions = true;
               }
               Element.extend = (function() {
                 if (Prototype.BrowserFeatures.SpecificElementExtensions)
                   return Prototype.K;
                 var Methods = { }, ByTag = Element.Methods.ByTag;
                 var extend = Object.extend(function(element) {
                   if (!element || element._extendedByPrototype ||
                       element.nodeType != 1 || element == window) return element;
                   var methods = Object.clone(Methods),
-            -       tagName = element.tagName, property, value;
+            +       tagName = element.tagName.toUpperCase(), property, value;
                   // extend methods for specific tags
                   if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
                   for (property in methods) {
                     value = methods[property];
                     if (Object.isFunction(value) && !(property in element))
                       element[property] = value.methodize();
                   }
                   element._extendedByPrototype = Prototype.emptyFunction;
                   return element;
                 }, {
                   refresh: function() {
                     // extend methods for all tags (Safari doesn't need this)
                     if (!Prototype.BrowserFeatures.ElementExtensions) {
                       Object.extend(Methods, Element.Methods);
                       Object.extend(Methods, Element.Methods.Simulated);
                     }
                   }
                 });
                 extend.refresh();
                 return extend;
               })();
               Element.hasAttribute = function(element, attribute) {
                 if (element.hasAttribute) return element.hasAttribute(attribute);
                 return Element.Methods.Simulated.hasAttribute(element, attribute);
               };
               Element.addMethods = function(methods) {
                 var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
                 if (!methods) {
                   Object.extend(Form, Form.Methods);
                   Object.extend(Form.Element, Form.Element.Methods);
                   Object.extend(Element.Methods.ByTag, {
                     "FORM":     Object.clone(Form.Methods),
                     "INPUT":    Object.clone(Form.Element.Methods),
                     "SELECT":   Object.clone(Form.Element.Methods),
                     "TEXTAREA": Object.clone(Form.Element.Methods)
                   });
                 }
                 if (arguments.length == 2) {
                   var tagName = methods;
                   methods = arguments[1];
                 }
                 if (!tagName) Object.extend(Element.Methods, methods || { });
                 else {
                   if (Object.isArray(tagName)) tagName.each(extend);
                   else extend(tagName);
                 }
                 function extend(tagName) {
                   tagName = tagName.toUpperCase();
                   if (!Element.Methods.ByTag[tagName])
                     Element.Methods.ByTag[tagName] = { };
                   Object.extend(Element.Methods.ByTag[tagName], methods);
                 }
                 function copy(methods, destination, onlyIfAbsent) {
                   onlyIfAbsent = onlyIfAbsent || false;
                   for (var property in methods) {
                     var value = methods[property];
                     if (!Object.isFunction(value)) continue;
                     if (!onlyIfAbsent || !(property in destination))
                       destination[property] = value.methodize();
                   }
                 }
                 function findDOMClass(tagName) {
                   var klass;
                   var trans = {
                     "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
                     "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
                     "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
                     "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
                     "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
                     "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
                     "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
                     "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
                     "FrameSet", "IFRAME": "IFrame"
                   };
                   if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
                   if (window[klass]) return window[klass];
                   klass = 'HTML' + tagName + 'Element';
                   if (window[klass]) return window[klass];
                   klass = 'HTML' + tagName.capitalize() + 'Element';
                   if (window[klass]) return window[klass];
                   window[klass] = { };
-            -     window[klass].prototype = document.createElement(tagName).__proto__;
+            +     window[klass].prototype = document.createElement(tagName)['__proto__'];
                   return window[klass];
                 }
                 if (F.ElementExtensions) {
                   copy(Element.Methods, HTMLElement.prototype);
                   copy(Element.Methods.Simulated, HTMLElement.prototype, true);
                 }
                 if (F.SpecificElementExtensions) {
                   for (var tag in Element.Methods.ByTag) {
                     var klass = findDOMClass(tag);
                     if (Object.isUndefined(klass)) continue;
                     copy(T[tag], klass.prototype);
                   }
                 }
                 Object.extend(Element, Element.Methods);
                 delete Element.ByTag;
                 if (Element.extend.refresh) Element.extend.refresh();
                 Element.cache = { };
               };
               document.viewport = {
                 getDimensions: function() {
-            -     var dimensions = { };
+            +     var dimensions = { }, B = Prototype.Browser;
-            -     var B = Prototype.Browser;
                   $w('width height').each(function(d) {
                     var D = d.capitalize();
-            -       dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] :
+            +       if (B.WebKit && !document.evaluate) {
-            -         (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D];
+            +         // Safari <3.0 needs self.innerWidth/Height
+            +         dimensions[d] = self['inner' + D];
+            +       } else if (B.Opera && parseFloat(window.opera.version()) < 9.5) {
+            +         // Opera <9.5 needs document.body.clientWidth/Height
+            +         dimensions[d] = document.body['client' + D]
+            +       } else {
+            +         dimensions[d] = document.documentElement['client' + D];
+            +       }
                   });
                   return dimensions;
                 },
                 getWidth: function() {
                   return this.getDimensions().width;
                 },
                 getHeight: function() {
                   return this.getDimensions().height;
                 },
                 getScrollOffsets: function() {
                   return Element._returnOffset(
                     window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
                     window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
                 }
               };
-            - /* Portions of the Selector class are derived from Jack Slocum’s DomQuery,
+            + /* Portions of the Selector class are derived from Jack Slocum's DomQuery,
                * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
                * license.  Please see http://www.yui-ext.com/ for more information. */
               var Selector = Class.create({
                 initialize: function(expression) {
                   this.expression = expression.strip();
+            +
+            +     if (this.shouldUseSelectorsAPI()) {
+            +       this.mode = 'selectorsAPI';
+            +     } else if (this.shouldUseXPath()) {
+            +       this.mode = 'xpath';
+            +       this.compileXPathMatcher();
+            +     } else {
+            +       this.mode = "normal";
                     this.compileMatcher();
+            +     }
+            +
                 },
                 shouldUseXPath: function() {
                   if (!Prototype.BrowserFeatures.XPath) return false;
                   var e = this.expression;
                   // Safari 3 chokes on :*-of-type and :empty
                   if (Prototype.Browser.WebKit &&
                    (e.include("-of-type") || e.include(":empty")))
                     return false;
                   // XPath can't do namespaced attributes, nor can it read
                   // the "checked" property from DOM nodes
-            -     if ((/(\[[\w-]*?:|:checked)/).test(this.expression))
+            +     if ((/(\[[\w-]*?:|:checked)/).test(e))
                     return false;
                   return true;
                 },
+            +   shouldUseSelectorsAPI: function() {
+            +     if (!Prototype.BrowserFeatures.SelectorsAPI) return false;
+            +
+            +     if (!Selector._div) Selector._div = new Element('div');
+            +
+            +     // Make sure the browser treats the selector as valid. Test on an
+            +     // isolated element to minimize cost of this check.
+            +     try {
+            +       Selector._div.querySelector(this.expression);
+            +     } catch(e) {
+            +       return false;
+            +     }
+            +
+            +     return true;
+            +   },
+            +
                 compileMatcher: function() {
-            -     if (this.shouldUseXPath())
-            -       return this.compileXPathMatcher();
                   var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
                       c = Selector.criteria, le, p, m;
                   if (Selector._cache[e]) {
                     this.matcher = Selector._cache[e];
                     return;
                   }
                   this.matcher = ["this.matcher = function(root) {",
                                   "var r = root, h = Selector.handlers, c = false, n;"];
                   while (e && le != e && (/\S/).test(e)) {
                     le = e;
                     for (var i in ps) {
                       p = ps[i];
                       if (m = e.match(p)) {
                         this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
                           new Template(c[i]).evaluate(m));
                         e = e.replace(m[0], '');
                         break;
                       }
                     }
                   }
                   this.matcher.push("return h.unique(n);\n}");
                   eval(this.matcher.join('\n'));
                   Selector._cache[this.expression] = this.matcher;
                 },
                 compileXPathMatcher: function() {
                   var e = this.expression, ps = Selector.patterns,
                       x = Selector.xpath, le, m;
                   if (Selector._cache[e]) {
                     this.xpath = Selector._cache[e]; return;
                   }
                   this.matcher = ['.//*'];
                   while (e && le != e && (/\S/).test(e)) {
                     le = e;
                     for (var i in ps) {
                       if (m = e.match(ps[i])) {
                         this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
                           new Template(x[i]).evaluate(m));
                         e = e.replace(m[0], '');
                         break;
                       }
                     }
                   }
                   this.xpath = this.matcher.join('');
                   Selector._cache[this.expression] = this.xpath;
                 },
                 findElements: function(root) {
                   root = root || document;
-            -     if (this.xpath) return document._getElementsByXPath(this.xpath, root);
+            +     var e = this.expression, results;
+            +
+            +     switch (this.mode) {
+            +       case 'selectorsAPI':
+            +         // querySelectorAll queries document-wide, then filters to descendants
+            +         // of the context element. That's not what we want.
+            +         // Add an explicit context to the selector if necessary.
+            +         if (root !== document) {
+            +           var oldId = root.id, id = $(root).identify();
+            +           e = "#" + id + " " + e;
+            +         }
+            +
+            +         results = $A(root.querySelectorAll(e)).map(Element.extend);
+            +         root.id = oldId;
+            +
+            +         return results;
+            +       case 'xpath':
+            +         return document._getElementsByXPath(this.xpath, root);
+            +       default:
                      return this.matcher(root);
+            +     }
                 },
                 match: function(element) {
                   this.tokens = [];
                   var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
                   var le, p, m;
                   while (e && le !== e && (/\S/).test(e)) {
                     le = e;
                     for (var i in ps) {
                       p = ps[i];
                       if (m = e.match(p)) {
                         // use the Selector.assertions methods unless the selector
                         // is too complex.
                         if (as[i]) {
                           this.tokens.push([i, Object.clone(m)]);
                           e = e.replace(m[0], '');
                         } else {
                           // reluctantly do a document-wide search
                           // and look for a match in the array
                           return this.findElements(document).include(element);
                         }
                       }
                     }
                   }
                   var match = true, name, matches;
                   for (var i = 0, token; token = this.tokens[i]; i++) {
                     name = token[0], matches = token[1];
                     if (!Selector.assertions[name](element, matches)) {
                       match = false; break;
                     }
                   }
                   return match;
                 },
                 toString: function() {
                   return this.expression;
                 },
                 inspect: function() {
                   return "#<Selector:" + this.expression.inspect() + ">";
                 }
               });
               Object.extend(Selector, {
                 _cache: { },
                 xpath: {
                   descendant:   "//*",
                   child:        "/*",
                   adjacent:     "/following-sibling::*[1]",
                   laterSibling: '/following-sibling::*',
                   tagName:      function(m) {
                     if (m[1] == '*') return '';
                     return "[local-name()='" + m[1].toLowerCase() +
                            "' or local-name()='" + m[1].toUpperCase() + "']";
                   },
                   className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
                   id:           "[@id='#{1}']",
                   attrPresence: function(m) {
                     m[1] = m[1].toLowerCase();
                     return new Template("[@#{1}]").evaluate(m);
                   },
                   attr: function(m) {
                     m[1] = m[1].toLowerCase();
                     m[3] = m[5] || m[6];
                     return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
                   },
                   pseudo: function(m) {
                     var h = Selector.xpath.pseudos[m[1]];
                     if (!h) return '';
                     if (Object.isFunction(h)) return h(m);
                     return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
                   },
                   operators: {
                     '=':  "[@#{1}='#{3}']",
                     '!=': "[@#{1}!='#{3}']",
                     '^=': "[starts-with(@#{1}, '#{3}')]",
                     '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
                     '*=': "[contains(@#{1}, '#{3}')]",
                     '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
                     '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
                   },
                   pseudos: {
                     'first-child': '[not(preceding-sibling::*)]',
                     'last-child':  '[not(following-sibling::*)]',
                     'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
-            -       'empty':       "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
+            +       'empty':       "[count(*) = 0 and (count(text()) = 0)]",
                     'checked':     "[@checked]",
-            -       'disabled':    "[@disabled]",
+            +       'disabled':    "[(@disabled) and (@type!='hidden')]",
-            -       'enabled':     "[not(@disabled)]",
+            +       'enabled':     "[not(@disabled) and (@type!='hidden')]",
                     'not': function(m) {
                       var e = m[6], p = Selector.patterns,
                           x = Selector.xpath, le, v;
                       var exclusion = [];
                       while (e && le != e && (/\S/).test(e)) {
                         le = e;
                         for (var i in p) {
                           if (m = e.match(p[i])) {
                             v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
                             exclusion.push("(" + v.substring(1, v.length - 1) + ")");
                             e = e.replace(m[0], '');
                             break;
                           }
                         }
                       }
                       return "[not(" + exclusion.join(" and ") + ")]";
                     },
                     'nth-child':      function(m) {
                       return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
                     },
                     'nth-last-child': function(m) {
                       return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
                     },
                     'nth-of-type':    function(m) {
                       return Selector.xpath.pseudos.nth("position() ", m);
                     },
                     'nth-last-of-type': function(m) {
                       return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
                     },
                     'first-of-type':  function(m) {
                       m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
                     },
                     'last-of-type':   function(m) {
                       m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
                     },
                     'only-of-type':   function(m) {
                       var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
                     },
                     nth: function(fragment, m) {
                       var mm, formula = m[6], predicate;
                       if (formula == 'even') formula = '2n+0';
                       if (formula == 'odd')  formula = '2n+1';
                       if (mm = formula.match(/^(\d+)$/)) // digit only
                         return '[' + fragment + "= " + mm[1] + ']';
                       if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
                         if (mm[1] == "-") mm[1] = -1;
                         var a = mm[1] ? Number(mm[1]) : 1;
                         var b = mm[2] ? Number(mm[2]) : 0;
                         predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
                         "((#{fragment} - #{b}) div #{a} >= 0)]";
                         return new Template(predicate).evaluate({
                           fragment: fragment, a: a, b: b });
                       }
                     }
                   }
                 },
                 criteria: {
                   tagName:      'n = h.tagName(n, r, "#{1}", c);      c = false;',
                   className:    'n = h.className(n, r, "#{1}", c);    c = false;',
                   id:           'n = h.id(n, r, "#{1}", c);           c = false;',
-            -     attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;',
+            +     attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;',
                   attr: function(m) {
                     m[3] = (m[5] || m[6]);
-            -       return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m);
+            +       return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m);
                   },
                   pseudo: function(m) {
                     if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
                     return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
                   },
                   descendant:   'c = "descendant";',
                   child:        'c = "child";',
                   adjacent:     'c = "adjacent";',
                   laterSibling: 'c = "laterSibling";'
                 },
                 patterns: {
                   // combinators must be listed first
                   // (and descendant needs to be last combinator)
                   laterSibling: /^\s*~\s*/,
                   child:        /^\s*>\s*/,
                   adjacent:     /^\s*\+\s*/,
                   descendant:   /^\s/,
                   // selectors follow
                   tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
                   id:           /^#([\w\-\*]+)(\b|$)/,
                   className:    /^\.([\w\-\*]+)(\b|$)/,
-            -     pseudo:       /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s)|(?=:))/,
+            +     pseudo:
-            -     attrPresence: /^\[([\w]+)\]/,
+            + /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/,
+            +     attrPresence: /^\[((?:[\w]+:)?[\w]+)\]/,
                   attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
                 },
                 // for Selector.match and Element#match
                 assertions: {
                   tagName: function(element, matches) {
                     return matches[1].toUpperCase() == element.tagName.toUpperCase();
                   },
                   className: function(element, matches) {
                     return Element.hasClassName(element, matches[1]);
                   },
                   id: function(element, matches) {
                     return element.id === matches[1];
                   },
                   attrPresence: function(element, matches) {
                     return Element.hasAttribute(element, matches[1]);
                   },
                   attr: function(element, matches) {
                     var nodeValue = Element.readAttribute(element, matches[1]);
-            -       return Selector.operators[matches[2]](nodeValue, matches[3]);
+            +       return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]);
                   }
                 },
                 handlers: {
                   // UTILITY FUNCTIONS
                   // joins two collections
                   concat: function(a, b) {
                     for (var i = 0, node; node = b[i]; i++)
                       a.push(node);
                     return a;
                   },
                   // marks an array of nodes for counting
                   mark: function(nodes) {
+            +       var _true = Prototype.emptyFunction;
                     for (var i = 0, node; node = nodes[i]; i++)
-            -         node._counted = true;
+            +         node._countedByPrototype = _true;
                     return nodes;
                   },
                   unmark: function(nodes) {
                     for (var i = 0, node; node = nodes[i]; i++)
-            -         node._counted = undefined;
+            +         node._countedByPrototype = undefined;
                     return nodes;
                   },
                   // mark each child node with its position (for nth calls)
                   // "ofType" flag indicates whether we're indexing for nth-of-type
                   // rather than nth-child
                   index: function(parentNode, reverse, ofType) {
-            -       parentNode._counted = true;
+            +       parentNode._countedByPrototype = Prototype.emptyFunction;
                     if (reverse) {
                       for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
                         var node = nodes[i];
-            -           if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+            +           if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
                       }
                     } else {
                       for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-            -           if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+            +           if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
                     }
                   },
                   // filters out duplicates and extends all nodes
                   unique: function(nodes) {
                     if (nodes.length == 0) return nodes;
                     var results = [], n;
                     for (var i = 0, l = nodes.length; i < l; i++)
-            -         if (!(n = nodes[i])._counted) {
+            +         if (!(n = nodes[i])._countedByPrototype) {
-            -           n._counted = true;
+            +           n._countedByPrototype = Prototype.emptyFunction;
                         results.push(Element.extend(n));
                       }
                     return Selector.handlers.unmark(results);
                   },
                   // COMBINATOR FUNCTIONS
                   descendant: function(nodes) {
                     var h = Selector.handlers;
                     for (var i = 0, results = [], node; node = nodes[i]; i++)
                       h.concat(results, node.getElementsByTagName('*'));
                     return results;
                   },
                   child: function(nodes) {
                     var h = Selector.handlers;
                     for (var i = 0, results = [], node; node = nodes[i]; i++) {
                       for (var j = 0, child; child = node.childNodes[j]; j++)
                         if (child.nodeType == 1 && child.tagName != '!') results.push(child);
                     }
                     return results;
                   },
                   adjacent: function(nodes) {
                     for (var i = 0, results = [], node; node = nodes[i]; i++) {
                       var next = this.nextElementSibling(node);
                       if (next) results.push(next);
                     }
                     return results;
                   },
                   laterSibling: function(nodes) {
                     var h = Selector.handlers;
                     for (var i = 0, results = [], node; node = nodes[i]; i++)
                       h.concat(results, Element.nextSiblings(node));
                     return results;
                   },
                   nextElementSibling: function(node) {
                     while (node = node.nextSibling)
                       if (node.nodeType == 1) return node;
                     return null;
                   },
                   previousElementSibling: function(node) {
                     while (node = node.previousSibling)
                       if (node.nodeType == 1) return node;
                     return null;
                   },
                   // TOKEN FUNCTIONS
                   tagName: function(nodes, root, tagName, combinator) {
-            -       tagName = tagName.toUpperCase();
+            +       var uTagName = tagName.toUpperCase();
                     var results = [], h = Selector.handlers;
                     if (nodes) {
                       if (combinator) {
                         // fastlane for ordinary descendant combinators
                         if (combinator == "descendant") {
                           for (var i = 0, node; node = nodes[i]; i++)
                             h.concat(results, node.getElementsByTagName(tagName));
                           return results;
                         } else nodes = this[combinator](nodes);
                         if (tagName == "*") return nodes;
                       }
                       for (var i = 0, node; node = nodes[i]; i++)
-            -           if (node.tagName.toUpperCase() == tagName) results.push(node);
+            +           if (node.tagName.toUpperCase() === uTagName) results.push(node);
                       return results;
                     } else return root.getElementsByTagName(tagName);
                   },
                   id: function(nodes, root, id, combinator) {
                     var targetNode = $(id), h = Selector.handlers;
                     if (!targetNode) return [];
                     if (!nodes && root == document) return [targetNode];
                     if (nodes) {
                       if (combinator) {
                         if (combinator == 'child') {
                           for (var i = 0, node; node = nodes[i]; i++)
                             if (targetNode.parentNode == node) return [targetNode];
                         } else if (combinator == 'descendant') {
                           for (var i = 0, node; node = nodes[i]; i++)
                             if (Element.descendantOf(targetNode, node)) return [targetNode];
                         } else if (combinator == 'adjacent') {
                           for (var i = 0, node; node = nodes[i]; i++)
                             if (Selector.handlers.previousElementSibling(targetNode) == node)
                               return [targetNode];
                         } else nodes = h[combinator](nodes);
                       }
                       for (var i = 0, node; node = nodes[i]; i++)
                         if (node == targetNode) return [targetNode];
                       return [];
                     }
                     return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
                   },
                   className: function(nodes, root, className, combinator) {
                     if (nodes && combinator) nodes = this[combinator](nodes);
                     return Selector.handlers.byClassName(nodes, root, className);
                   },
                   byClassName: function(nodes, root, className) {
                     if (!nodes) nodes = Selector.handlers.descendant([root]);
                     var needle = ' ' + className + ' ';
                     for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
                       nodeClassName = node.className;
                       if (nodeClassName.length == 0) continue;
                       if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
                         results.push(node);
                     }
                     return results;
                   },
-            -     attrPresence: function(nodes, root, attr) {
+            +     attrPresence: function(nodes, root, attr, combinator) {
                     if (!nodes) nodes = root.getElementsByTagName("*");
+            +       if (nodes && combinator) nodes = this[combinator](nodes);
                     var results = [];
                     for (var i = 0, node; node = nodes[i]; i++)
                       if (Element.hasAttribute(node, attr)) results.push(node);
                     return results;
                   },
-            -     attr: function(nodes, root, attr, value, operator) {
+            +     attr: function(nodes, root, attr, value, operator, combinator) {
                     if (!nodes) nodes = root.getElementsByTagName("*");
+            +       if (nodes && combinator) nodes = this[combinator](nodes);
                     var handler = Selector.operators[operator], results = [];
                     for (var i = 0, node; node = nodes[i]; i++) {
                       var nodeValue = Element.readAttribute(node, attr);
                       if (nodeValue === null) continue;
                       if (handler(nodeValue, value)) results.push(node);
                     }
                     return results;
                   },
                   pseudo: function(nodes, name, value, root, combinator) {
                     if (nodes && combinator) nodes = this[combinator](nodes);
                     if (!nodes) nodes = root.getElementsByTagName("*");
                     return Selector.pseudos[name](nodes, value, root);
                   }
                 },
                 pseudos: {
                   'first-child': function(nodes, value, root) {
                     for (var i = 0, results = [], node; node = nodes[i]; i++) {
                       if (Selector.handlers.previousElementSibling(node)) continue;
                         results.push(node);
                     }
                     return results;
                   },
                   'last-child': function(nodes, value, root) {
                     for (var i = 0, results = [], node; node = nodes[i]; i++) {
                       if (Selector.handlers.nextElementSibling(node)) continue;
                         results.push(node);
                     }
                     return results;
                   },
                   'only-child': function(nodes, value, root) {
                     var h = Selector.handlers;
                     for (var i = 0, results = [], node; node = nodes[i]; i++)
                       if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
                         results.push(node);
                     return results;
                   },
                   'nth-child':        function(nodes, formula, root) {
                     return Selector.pseudos.nth(nodes, formula, root);
                   },
                   'nth-last-child':   function(nodes, formula, root) {
                     return Selector.pseudos.nth(nodes, formula, root, true);
                   },
                   'nth-of-type':      function(nodes, formula, root) {
                     return Selector.pseudos.nth(nodes, formula, root, false, true);
                   },
                   'nth-last-of-type': function(nodes, formula, root) {
                     return Selector.pseudos.nth(nodes, formula, root, true, true);
                   },
                   'first-of-type':    function(nodes, formula, root) {
                     return Selector.pseudos.nth(nodes, "1", root, false, true);
                   },
                   'last-of-type':     function(nodes, formula, root) {
                     return Selector.pseudos.nth(nodes, "1", root, true, true);
                   },
                   'only-of-type':     function(nodes, formula, root) {
                     var p = Selector.pseudos;
                     return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
                   },
                   // handles the an+b logic
                   getIndices: function(a, b, total) {
                     if (a == 0) return b > 0 ? [b] : [];
                     return $R(1, total).inject([], function(memo, i) {
                       if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
                       return memo;
                     });
                   },
                   // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
                   nth: function(nodes, formula, root, reverse, ofType) {
                     if (nodes.length == 0) return [];
                     if (formula == 'even') formula = '2n+0';
                     if (formula == 'odd')  formula = '2n+1';
                     var h = Selector.handlers, results = [], indexed = [], m;
                     h.mark(nodes);
                     for (var i = 0, node; node = nodes[i]; i++) {
-            -         if (!node.parentNode._counted) {
+            +         if (!node.parentNode._countedByPrototype) {
                         h.index(node.parentNode, reverse, ofType);
                         indexed.push(node.parentNode);
                       }
                     }
                     if (formula.match(/^\d+$/)) { // just a number
                       formula = Number(formula);
                       for (var i = 0, node; node = nodes[i]; i++)
                         if (node.nodeIndex == formula) results.push(node);
                     } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
                       if (m[1] == "-") m[1] = -1;
                       var a = m[1] ? Number(m[1]) : 1;
                       var b = m[2] ? Number(m[2]) : 0;
                       var indices = Selector.pseudos.getIndices(a, b, nodes.length);
                       for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
                         for (var j = 0; j < l; j++)
                           if (node.nodeIndex == indices[j]) results.push(node);
                       }
                     }
                     h.unmark(nodes);
                     h.unmark(indexed);
                     return results;
                   },
                   'empty': function(nodes, value, root) {
                     for (var i = 0, results = [], node; node = nodes[i]; i++) {
                       // IE treats comments as element nodes
-            -         if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
+            +         if (node.tagName == '!' || node.firstChild) continue;
                       results.push(node);
                     }
                     return results;
                   },
                   'not': function(nodes, selector, root) {
                     var h = Selector.handlers, selectorType, m;
                     var exclusions = new Selector(selector).findElements(root);
                     h.mark(exclusions);
                     for (var i = 0, results = [], node; node = nodes[i]; i++)
-            -         if (!node._counted) results.push(node);
+            +         if (!node._countedByPrototype) results.push(node);
                     h.unmark(exclusions);
                     return results;
                   },
                   'enabled': function(nodes, value, root) {
                     for (var i = 0, results = [], node; node = nodes[i]; i++)
-            -         if (!node.disabled) results.push(node);
+            +         if (!node.disabled && (!node.type || node.type !== 'hidden'))
+            +           results.push(node);
                     return results;
                   },
                   'disabled': function(nodes, value, root) {
                     for (var i = 0, results = [], node; node = nodes[i]; i++)
                       if (node.disabled) results.push(node);
                     return results;
                   },
                   'checked': function(nodes, value, root) {
                     for (var i = 0, results = [], node; node = nodes[i]; i++)
                       if (node.checked) results.push(node);
                     return results;
                   }
                 },
                 operators: {
                   '=':  function(nv, v) { return nv == v; },
                   '!=': function(nv, v) { return nv != v; },
-            -     '^=': function(nv, v) { return nv.startsWith(v); },
+            +     '^=': function(nv, v) { return nv == v || nv && nv.startsWith(v); },
+            +     '$=': function(nv, v) { return nv == v || nv && nv.endsWith(v); },
+            +     '*=': function(nv, v) { return nv == v || nv && nv.include(v); },
                   '$=': function(nv, v) { return nv.endsWith(v); },
                   '*=': function(nv, v) { return nv.include(v); },
                   '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
-            -     '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
+            +     '|=': function(nv, v) { return ('-' + (nv || "").toUpperCase() +
+            +      '-').include('-' + (v || "").toUpperCase() + '-'); }
+            +   },
+            +
+            +   split: function(expression) {
+            +     var expressions = [];
+            +     expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+            +       expressions.push(m[1].strip());
+            +     });
+            +     return expressions;
                 },
                 matchElements: function(elements, expression) {
-            -     var matches = new Selector(expression).findElements(), h = Selector.handlers;
+            +     var matches = $$(expression), h = Selector.handlers;
                   h.mark(matches);
                   for (var i = 0, results = [], element; element = elements[i]; i++)
-            -       if (element._counted) results.push(element);
+            +       if (element._countedByPrototype) results.push(element);
                   h.unmark(matches);
                   return results;
                 },
                 findElement: function(elements, expression, index) {
                   if (Object.isNumber(expression)) {
                     index = expression; expression = false;
                   }
                   return Selector.matchElements(elements, expression || '*')[index || 0];
                 },
                 findChildElements: function(element, expressions) {
-            -     var exprs = expressions.join(',');
+            +     expressions = Selector.split(expressions.join(','));
-            -     expressions = [];
-            -     exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-            -       expressions.push(m[1].strip());
-            -     });
                   var results = [], h = Selector.handlers;
                   for (var i = 0, l = expressions.length, selector; i < l; i++) {
                     selector = new Selector(expressions[i].strip());
                     h.concat(results, selector.findElements(element));
                   }
                   return (l > 1) ? h.unique(results) : results;
                 }
               });
               if (Prototype.Browser.IE) {
+            +   Object.extend(Selector.handlers, {
                   // IE returns comment nodes on getElementsByTagName("*").
                   // Filter them out.
-            -   Selector.handlers.concat = function(a, b) {
+            +     concat: function(a, b) {
                     for (var i = 0, node; node = b[i]; i++)
                       if (node.tagName !== "!") a.push(node);
                     return a;
-            -   };
+            +     },
+            +
+            +     // IE improperly serializes _countedByPrototype in (inner|outer)HTML.
+            +     unmark: function(nodes) {
+            +       for (var i = 0, node; node = nodes[i]; i++)
+            +         node.removeAttribute('_countedByPrototype');
+            +       return nodes;
+            +     }
+            +   });
               }
               function $$() {
                 return Selector.findChildElements(document, $A(arguments));
               }
               var Form = {
                 reset: function(form) {
                   $(form).reset();
                   return form;
                 },
                 serializeElements: function(elements, options) {
                   if (typeof options != 'object') options = { hash: !!options };
                   else if (Object.isUndefined(options.hash)) options.hash = true;
                   var key, value, submitted = false, submit = options.submit;
                   var data = elements.inject({ }, function(result, element) {
                     if (!element.disabled && element.name) {
                       key = element.name; value = $(element).getValue();
-            -         if (value != null && (element.type != 'submit' || (!submitted &&
+            +         if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted &&
                           submit !== false && (!submit || key == submit) && (submitted = true)))) {
                         if (key in result) {
                           // a key is already present; construct an array of values
                           if (!Object.isArray(result[key])) result[key] = [result[key]];
                           result[key].push(value);
                         }
                         else result[key] = value;
                       }
                     }
                     return result;
                   });
                   return options.hash ? data : Object.toQueryString(data);
                 }
               };
               Form.Methods = {
                 serialize: function(form, options) {
                   return Form.serializeElements(Form.getElements(form), options);
                 },
                 getElements: function(form) {
                   return $A($(form).getElementsByTagName('*')).inject([],
                     function(elements, child) {
                       if (Form.Element.Serializers[child.tagName.toLowerCase()])
                         elements.push(Element.extend(child));
                       return elements;
                     }
                   );
                 },
                 getInputs: function(form, typeName, name) {
                   form = $(form);
                   var inputs = form.getElementsByTagName('input');
                   if (!typeName && !name) return $A(inputs).map(Element.extend);
                   for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
                     var input = inputs[i];
                     if ((typeName && input.type != typeName) || (name && input.name != name))
                       continue;
                     matchingInputs.push(Element.extend(input));
                   }
                   return matchingInputs;
                 },
                 disable: function(form) {
                 serialize: function(element) {
                   element = $(element);
                   if (!element.disabled && element.name) {
                     var value = element.getValue();
                     if (value != undefined) {
                       var pair = { };
                       pair[element.name] = value;
                       return Object.toQueryString(pair);
                     }
                   }
                   return '';
                 },
                 getValue: function(element) {
                   element = $(element);
                   var method = element.tagName.toLowerCase();
                   return Form.Element.Serializers[method](element);
                 },
                 setValue: function(element, value) {
                   element = $(element);
                   var method = element.tagName.toLowerCase();
                   Form.Element.Serializers[method](element, value);
                   return element;
                 },
                 clear: function(element) {
                   $(element).value = '';
                   return element;
                 },
                 present: function(element) {
                   return $(element).value != '';
                 },
                 activate: function(element) {
                   element = $(element);
                   try {
                     element.focus();
                     if (element.select && (element.tagName.toLowerCase() != 'input' ||
                         !['button', 'reset', 'submit'].include(element.type)))
                       element.select();
                   } catch (e) { }
                   return element;
                 },
                 disable: function(element) {
                   element = $(element);
-            -     element.blur();
                   element.disabled = true;
                   return element;
                 },
                 enable: function(element) {
                   element = $(element);
                   element.disabled = false;
                   return element;
                 }
               };
               /*--------------------------------------------------------------------------*/
               var Field = Form.Element;
               var $F = Form.Element.Methods.getValue;
               /*--------------------------------------------------------------------------*/
               Form.Element.Serializers = {
                 input: function(element, value) {
                   switch (element.type.toLowerCase()) {
                     case 'checkbox':
                     case 'radio':
                       return Form.Element.Serializers.inputSelector(element, value);
                     default:
                       return Form.Element.Serializers.textarea(element, value);
                   }
                 },
                 inputSelector: function(element, value) {
                   if (Object.isUndefined(value)) return element.checked ? element.value : null;
                   else element.checked = !!value;
                 },
                 textarea: function(element, value) {
                   if (Object.isUndefined(value)) return element.value;
                   else element.value = value;
                 },
-            -   select: function(element, index) {
+            +   select: function(element, value) {
-            -     if (Object.isUndefined(index))
+            +     if (Object.isUndefined(value))
                     return this[element.type == 'select-one' ?
                       'selectOne' : 'selectMany'](element);
                   else {
-            -       var opt, value, single = !Object.isArray(index);
+            +       var opt, currentValue, single = !Object.isArray(value);
                     for (var i = 0, length = element.length; i < length; i++) {
                       opt = element.options[i];
-            -         value = this.optionValue(opt);
+            +         currentValue = this.optionValue(opt);
                       if (single) {
-            -           if (value == index) {
+            +           if (currentValue == value) {
                           opt.selected = true;
                           return;
                         }
                       }
-            -         else opt.selected = index.include(value);
+            +         else opt.selected = value.include(currentValue);
                     }
                   }
                 },
                 selectOne: function(element) {
                   var index = element.selectedIndex;
                   return index >= 0 ? this.optionValue(element.options[index]) : null;
                 },
                 selectMany: function(element) {
                   var values, length = element.length;
                   if (!length) return null;
                   for (var i = 0, values = []; i < length; i++) {
                     var opt = element.options[i];
                     if (opt.selected) values.push(this.optionValue(opt));
                   }
                   return values;
                 },
                 optionValue: function(opt) {
                   // extend element because hasAttribute may not be native
                   return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
                 }
               };
               /*--------------------------------------------------------------------------*/
               Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
                 initialize: function($super, element, frequency, callback) {
                   $super(callback, frequency);
                   this.element   = $(element);
                   this.lastValue = this.getValue();
                 },
                 execute: function() {
                   var value = this.getValue();
                   if (Object.isString(this.lastValue) && Object.isString(value) ?
                       this.lastValue != value : String(this.lastValue) != String(value)) {
                     this.callback(this.element, value);
                     this.lastValue = value;
                   }
                 }
               });
               Form.Element.Observer = Class.create(Abstract.TimedObserver, {
                 getValue: function() {
                   return Form.Element.getValue(this.element);
                 KEY_END:      35,
                 KEY_PAGEUP:   33,
                 KEY_PAGEDOWN: 34,
                 KEY_INSERT:   45,
                 cache: { },
                 relatedTarget: function(event) {
                   var element;
                   switch(event.type) {
                     case 'mouseover': element = event.fromElement; break;
                     case 'mouseout':  element = event.toElement;   break;
                     default: return null;
                   }
                   return Element.extend(element);
                 }
               });
               Event.Methods = (function() {
                 var isButton;
                 if (Prototype.Browser.IE) {
                   var buttonMap = { 0: 1, 1: 4, 2: 2 };
                   isButton = function(event, code) {
                     return event.button == buttonMap[code];
                   };
                 } else if (Prototype.Browser.WebKit) {
                   isButton = function(event, code) {
                     switch (code) {
                       case 0: return event.which == 1 && !event.metaKey;
                       case 1: return event.which == 1 && event.metaKey;
                       default: return false;
                     }
                   };
                 } else {
                   isButton = function(event, code) {
                     return event.which ? (event.which === code + 1) : (event.button === code);
                   };
                 }
                 return {
                   isLeftClick:   function(event) { return isButton(event, 0) },
                   isMiddleClick: function(event) { return isButton(event, 1) },
                   isRightClick:  function(event) { return isButton(event, 2) },
                   element: function(event) {
-            -       var node = Event.extend(event).target;
+            +       event = Event.extend(event);
-            -       return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
+            +       var node          = event.target,
+            +           type          = event.type,
+            +           currentTarget = event.currentTarget;
+            +
+            +       if (currentTarget && currentTarget.tagName) {
+            +         // Firefox screws up the "click" event when moving between radio buttons
+            +         // via arrow keys. It also screws up the "load" and "error" events on images,
+            +         // reporting the document as the target instead of the original image.
+            +         if (type === 'load' || type === 'error' ||
+            +           (type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
+            +             && currentTarget.type === 'radio'))
+            +               node = currentTarget;
+            +       }
+            +       if (node.nodeType == Node.TEXT_NODE) node = node.parentNode;
+            +       return Element.extend(node);
                   },
                   findElement: function(event, expression) {
                     var element = Event.element(event);
                     if (!expression) return element;
                     var elements = [element].concat(element.ancestors());
                     return Selector.findElement(elements, expression, 0);
                   },
                   pointer: function(event) {
+            +       var docElement = document.documentElement,
+            +       body = document.body || { scrollLeft: 0, scrollTop: 0 };
                     return {
                       x: event.pageX || (event.clientX +
-            -           (document.documentElement.scrollLeft || document.body.scrollLeft)),
+            +           (docElement.scrollLeft || body.scrollLeft) -
+            +           (docElement.clientLeft || 0)),
                       y: event.pageY || (event.clientY +
-            -           (document.documentElement.scrollTop || document.body.scrollTop))
+            +           (docElement.scrollTop || body.scrollTop) -
+            +           (docElement.clientTop || 0))
                     };
                   },
                   pointerX: function(event) { return Event.pointer(event).x },
                   pointerY: function(event) { return Event.pointer(event).y },
                   stop: function(event) {
                     Event.extend(event);
                     event.preventDefault();
                     event.stopPropagation();
                     event.stopped = true;
                   }
                 };
               })();
               Event.extend = (function() {
                 var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
                   m[name] = Event.Methods[name].methodize();
                   return m;
                 });
                 if (Prototype.Browser.IE) {
                   Object.extend(methods, {
                     stopPropagation: function() { this.cancelBubble = true },
                     preventDefault:  function() { this.returnValue = false },
                     inspect: function() { return "[object Event]" }
                   });
                   return function(event) {
                     if (!event) return false;
                     if (event._extendedByPrototype) return event;
                     event._extendedByPrototype = Prototype.emptyFunction;
                     var pointer = Event.pointer(event);
                     Object.extend(event, {
                       target: event.srcElement,
                       relatedTarget: Event.relatedTarget(event),
                       pageX:  pointer.x,
                       pageY:  pointer.y
                     });
                     return Object.extend(event, methods);
                   };
                 } else {
-            -     Event.prototype = Event.prototype || document.createEvent("HTMLEvents").__proto__;
+            +     Event.prototype = Event.prototype || document.createEvent("HTMLEvents")['__proto__'];
                   Object.extend(Event.prototype, methods);
                   return Prototype.K;
                 }
               })();
               Object.extend(Event, (function() {
                 var cache = Event.cache;
                 function getEventID(element) {
-            -     if (element._eventID) return element._eventID;
+            +     if (element._prototypeEventID) return element._prototypeEventID[0];
                   arguments.callee.id = arguments.callee.id || 1;
-            -     return element._eventID = ++arguments.callee.id;
+            +     return element._prototypeEventID = [++arguments.callee.id];
                 }
                 function getDOMEventName(eventName) {
                   if (eventName && eventName.include(':')) return "dataavailable";
                   return eventName;
                 }
                 function getCacheForID(id) {
                   return cache[id] = cache[id] || { };
                 }
                 function getWrappersForEventName(id, eventName) {
                   var c = getCacheForID(id);
                   return c[eventName] = c[eventName] || [];
                 }
                 function createWrapper(element, eventName, handler) {
                   var id = getEventID(element);
                   var c = getWrappersForEventName(id, eventName);
                   if (c.pluck("handler").include(handler)) return false;
                   var wrapper = function(event) {
                     if (!Event || !Event.extend ||
                       (event.eventName && event.eventName != eventName))
                         return false;
                     Event.extend(event);
-            -       handler.call(element, event)
+            +       handler.call(element, event);
                   };
                   wrapper.handler = handler;
                   c.push(wrapper);
                   return wrapper;
                 }
                 function findWrapper(id, eventName, handler) {
                   var c = getWrappersForEventName(id, eventName);
                   return c.find(function(wrapper) { return wrapper.handler == handler });
                 }
                 function destroyWrapper(id, eventName, handler) {
                   var c = getCacheForID(id);
                   if (!c[eventName]) return false;
                   c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
                 }
                 function destroyCache() {
                   for (var id in cache)
                     for (var eventName in cache[id])
                       cache[id][eventName] = null;
                 }
+            +
+            +   // Internet Explorer needs to remove event handlers on page unload
+            +   // in order to avoid memory leaks.
                 if (window.attachEvent) {
                   window.attachEvent("onunload", destroyCache);
                 }
+            +   // Safari has a dummy event handler on page unload so that it won't
+            +   // use its bfcache. Safari <= 3.1 has an issue with restoring the "document"
+            +   // object when page is returned to via the back button using its bfcache.
+            +   if (Prototype.Browser.WebKit) {
+            +     window.addEventListener('unload', Prototype.emptyFunction, false);
+            +   }
+            +
                 return {
                   observe: function(element, eventName, handler) {
                     element = $(element);
                     var name = getDOMEventName(eventName);
                     var wrapper = createWrapper(element, eventName, handler);
                     if (!wrapper) return element;
                     if (element.addEventListener) {
                       element.addEventListener(name, wrapper, false);
                     } else {
                       element.attachEvent("on" + name, wrapper);
                     }
                     return element;
                   },
                   stopObserving: function(element, eventName, handler) {
                     element = $(element);
                     var id = getEventID(element), name = getDOMEventName(eventName);
                     if (!handler && eventName) {
                       getWrappersForEventName(id, eventName).each(function(wrapper) {
                         element.stopObserving(eventName, wrapper.handler);
                       });
                       return element;
                     } else if (!eventName) {
                       Object.keys(getCacheForID(id)).each(function(eventName) {
                         element.stopObserving(eventName);
                       });
                       return element;
                     }
                     var wrapper = findWrapper(id, eventName, handler);
                     if (!wrapper) return element;
                     if (element.removeEventListener) {
                       element.removeEventListener(name, wrapper, false);
                     } else {
                       element.detachEvent("on" + name, wrapper);
                     }
                     destroyWrapper(id, eventName, handler);
                     return element;
                   },
                   fire: function(element, eventName, memo) {
                     element = $(element);
                     if (element == document && document.createEvent && !element.dispatchEvent)
                       element = document.documentElement;
+            +       var event;
                     if (document.createEvent) {
-            -         var event = document.createEvent("HTMLEvents");
+            +         event = document.createEvent("HTMLEvents");
                       event.initEvent("dataavailable", true, true);
                     } else {
-            -         var event = document.createEventObject();
+            +         event = document.createEventObject();
                       event.eventType = "ondataavailable";
                     }
                     event.eventName = eventName;
                     event.memo = memo || { };
                     if (document.createEvent) {
                       element.dispatchEvent(event);
                     } else {
                       element.fireEvent(event.eventType, event);
                     }
                     return Event.extend(event);
                   }
                 };
               })());
               Object.extend(Event, Event.Methods);
               Element.addMethods({
                 fire:          Event.fire,
                 observe:       Event.observe,
                 stopObserving: Event.stopObserving
               });
               Object.extend(document, {
                 fire:          Element.Methods.fire.methodize(),
                 observe:       Element.Methods.observe.methodize(),
-            -   stopObserving: Element.Methods.stopObserving.methodize()
+            +   stopObserving: Element.Methods.stopObserving.methodize(),
+            +   loaded:        false
               });
               (function() {
                 /* Support for the DOMContentLoaded event is based on work by Dan Webb,
                    Matthias Miller, Dean Edwards and John Resig. */
-            -   var timer, fired = false;
+            +   var timer;
                 function fireContentLoadedEvent() {
-            -     if (fired) return;
+            +     if (document.loaded) return;
                   if (timer) window.clearInterval(timer);
                   document.fire("dom:loaded");
-            -     fired = true;
+            +     document.loaded = true;
                 }
                 if (document.addEventListener) {
                   if (Prototype.Browser.WebKit) {
                     timer = window.setInterval(function() {
                       if (/loaded|complete/.test(document.readyState))
                         fireContentLoadedEvent();
                     }, 0);
                     Event.observe(window, "load", fireContentLoadedEvent);
                   } else {
                     document.addEventListener("DOMContentLoaded",
                       fireContentLoadedEvent, false);
                   }
                 } else {
                   document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
                   $("__onDOMContentLoaded").onreadystatechange = function() {
                     if (this.readyState == "complete") {
                       this.onreadystatechange = null;
                       fireContentLoadedEvent();
                     }
                   };
                 }
               })();
               /*------------------------------- DEPRECATED -------------------------------*/
               Hash.toQueryString = Object.toQueryString;
               var Toggle = { display: Element.toggle };
               Element.Methods.childOf = Element.Methods.descendantOf;
               var Insertion = {
                 Before: function(element, content) {
                   return Element.insert(element, {before:content});
                 },
                 Top: function(element, content) {
                   return Element.insert(element, {top:content});
                 },
                 Bottom: function(element, content) {
                   return Element.insert(element, {bottom:content});
                 },
                 After: function(element, content) {

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r163:74e3afe899a3 - Sun, 12 Apr 2009 15:34:49 - 5 files changed: 433 inserted, 328 deleted

Sign in to your account

Commit r163:74e3afe899a3 public

Author

r163:74e3afe899a3 - Sun, 12 Apr 2009 15:34:49 - 5 files changed: 433 inserted, 328 deleted

Commit `r163:74e3afe899a3` public