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

                 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
                     $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')
                         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

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-2007 Jon Tirsen (http://www.tirsen.com)
+            + //           (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+            + //           (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.
-              // 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.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];
-                            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 || { });
                 }
               });
               // 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();
                   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;
                   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);
                   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");
                 },
                 reset: function() {
                   if(this.last_active)
                     this.deactivate(this.last_active);
                 }
-            - }
+            + };
               var Draggables = {
                 drags: [],
                 observers: [],
                 register: function(draggable) {
                   ['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 = {
                     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');
-            -       if (!this.element._originallyAbsolute)
+            +       this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+            +       if (!this._originallyAbsolute)
                       Position.absolutize(this.element);
                     this.element.parentNode.insertBefore(this._clone, this.element);
                   }
                   if(this.options.scroll) {
                     if (this.options.scroll == window) {
                     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) {
                   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";
                       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 };
                 }
               });
                   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');
                   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 = [];
                       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;
                 },
                   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) {
                   } 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 = [];
                     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

                   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 (
-            -         ((pos % (1/pulses)) * pulses).round() == 0 ?
-            -               ((pos * pulses * 2) - (pos * pulses * 2).floor()) :
-            -           1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
-            -         );
+            +       return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
                   },
-                  spring: function(pos) {
-                    return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
                   },
                   none: function(pos) {
                     return 0;
                   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){ '+
-            -       'if (this.state=="idle"){this.state="running";'+
-            -       codeForEvent(this.options,'beforeSetup')+
-            -       (this.setup ? 'this.setup();':'')+
-            -       codeForEvent(this.options,'afterSetup')+
-            -       '};if (this.state=="running"){'+
-            -       'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
-            -       'this.position=pos;'+
-            -       codeForEvent(this.options,'beforeUpdate')+
-            -       (this.update ? 'this.update(pos);':'')+
-            -       codeForEvent(this.options,'afterUpdate')+
-            -       '}}');
+            +     this.render = (function() {
+            +       function dispatch(effect, eventName) {
+            +         if (effect.options[eventName + 'Internal'])
+            +           effect.options[eventName + 'Internal'](effect);
+            +         if (effect.options[eventName])
+            +           effect.options[eventName](effect);
+            +       }
+            +
+            +       return function(pos) {
+            +         if (this.state === "idle") {
+            +           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);
                 },
                 }
               });
               Effect.ScrollTo = function(element) {
                 var options = arguments[1] || { },
-                  scrollOffsets = document.viewport.getScrollOffsets(),
-            -     elementOffsets = $(element).cumulativeOffset(),
-            -     max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();
+            +   elementOffsets = $(element).cumulativeOffset();
                 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) {
                 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] || { })
                  );
               };
-                      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);
                     { 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');
-                             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);
                      }, options)
                 );
               };
               Effect.Pulsate = function(element) {
                 element = $(element);
-            -   var options    = arguments[1] || { };
-            -   var oldOpacity = element.getInlineOpacity();
-            -   var transition = options.transition || Effect.Transitions.sinoidal;
-            -   var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
-            -   reverser.bind(transition);
+            +   var options    = arguments[1] || { },
+            +     oldOpacity = element.getInlineOpacity(),
+            +     transition = options.transition || Effect.Transitions.linear,
+            +     reverser   = function(pos){
+            +       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}));
               };
                       });
                       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') {
                     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] =
                   });
                 };
               } else {
                 Element.getStyles = function(element) {
                   element = $(element);
                   var css = element.currentStyle, styles;
-            -     styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
-            -       hash.set(property, css[property]);
-            -       return hash;
+            +     styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
+            +       results[property] = css[property];
+            +       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);
                 '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
-            -  *  (c) 2005-2007 Sam Stephenson
+            + /*  Prototype JavaScript framework, version 1.6.0.3
+            +  *  (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),
-            -     Opera:  !!window.opera,
+            +     IE:     !!(window.attachEvent &&
+            +       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('form').__proto__
+            +       document.createElement('div')['__proto__'] &&
+            +       document.createElement('div')['__proto__'] !==
+            +         document.createElement('form')['__proto__']
                 },
                 ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
                 JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
                 emptyFunction: function() { },
                     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), {
-            -           valueOf:  function() { return method },
-            -           toString: function() { return method.toString() }
-            -         });
+            +         })(property).wrap(method);
+            +
+            +         value.valueOf = method.valueOf.bind(method);
+            +         value.toString = method.toString.bind(method);
                     }
                     this.prototype[property] = value;
                   }
                   return this;
                 }
               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;
                   }
                 },
                 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;
                 },
                   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();
                   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)));
                   }
                 },
                   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) + ':' +
               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);
               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;
                 },
                       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))
                     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) {
                     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');
                 },
                 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]') &&
-            -         iterable.toArray) return iterable.toArray();
-            -     var length = iterable.length, results = new Array(length);
+            +     // In Safari, only use the `toArray` method if it's not a NodeList.
+            +     // A NodeList is a function, has an function `item` property, and a numeric
+            +     // `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);
                 },
                 succ: function() {
                   return this + 1;
                 },
-            -   times: function(iterator) {
-            -     $R(0, this, true).each(iterator);
+            +   times: function(iterator, context) {
+            +     $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;
                   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];
                       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 toQueryPair(key, values);
+            +             return results.concat(values.map(toQueryPair.curry(key)));
+            +         } else results.push(toQueryPair(key, values));
+            +         return results;
                     }).join('&');
                   },
                   inspect: function() {
                     return '#<Hash:{' + this.map(function(pair) {
                       return pair.map(Object.inspect).join(': ');
                     } 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);
                   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());
                 _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);
                   }
                 }
               });
                     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) {
                   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);
                   element = $(element);
                   if (Object.isString(insertions) || Object.isNumber(insertions) ||
                       Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
                         insertions = {bottom:insertions};
-            -     var content, t, range;
+            -
-            -     for (position in insertions) {
+            +     var content, insert, tagName, childNodes;
+            +
+            +     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();
-            -       t.initializeRange(element, range);
-            -       t.insert(element, range.createContextualFragment(content.stripScripts()));
+            +       tagName = ((position == 'before' || position == 'after')
+            +         ? element.parentNode : element).tagName.toUpperCase();
+            +
+            +       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;
                 },
                 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);
                 },
                 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) :
-            -       ancestors[index || 0];
+            +     return Object.isNumber(expression) ? ancestors[expression] :
+            +       Selector.findElement(ancestors, expression, index);
                 },
                 down: function(element, expression, index) {
                   element = $(element);
                   if (arguments.length == 1) return element.firstDescendant();
-            -     var descendants = element.descendants();
-            -     return expression ? Selector.findElement(descendants, expression, index) :
-            -       descendants[index || 0];
+            +     return Object.isNumber(expression) ? element.descendants()[expression] :
+            +       Element.select(element, expression)[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) :
-            -       previousSiblings[index || 0];
+            +     return Object.isNumber(expression) ? previousSiblings[expression] :
+            +       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) :
-            -       nextSiblings[index || 0];
+            +     return Object.isNumber(expression) ? nextSiblings[expression] :
+            +       Selector.findElement(nextSiblings, expression, index);
                 },
                 select: function() {
                   var args = $A(arguments), element = $(args.shift());
                   return Selector.findChildElements(element, args);
                 },
                 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) {
-            -       var e = element.sourceIndex, a = ancestor.sourceIndex,
-            -        nextAncestor = ancestor.nextSibling;
-            -       if (!nextAncestor) {
-            -         do { ancestor = ancestor.parentNode; }
-            -         while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-            -       }
-            -       if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
-            -     }
+            +     if (ancestor.contains)
+            +       return ancestor.contains(element) && ancestor !== element;
                   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();
                 },
                 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;
                 },
                     (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 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;
                 },
                   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;
                   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.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);
                     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;
                     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];
                       }
                     }
                   }
                 };
                 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._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, {
                 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) { }
                   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);
                 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: {
-            -     adjacency: 'beforeBegin',
-            -     insert: function(element, node) {
+            +   before: function(element, node) {
-                    element.parentNode.insertBefore(node, element);
-                  },
-            -     initializeRange: function(element, range) {
-            -       range.setStartBefore(element);
-            -     }
-            -   },
-            -   top: {
-            -     adjacency: 'afterBegin',
-            -     insert: function(element, node) {
+            +   top: function(element, node) {
-                    element.insertBefore(node, element.firstChild);
-                  },
-            -     initializeRange: function(element, range) {
-            -       range.selectNodeContents(element);
-            -       range.collapse(true);
-            -     }
-            -   },
-            -   bottom: {
-            -     adjacency: 'beforeEnd',
-            -     insert: function(element, node) {
+            +   bottom: function(element, node) {
-                    element.appendChild(node);
-            -     }
-            -   },
-            -   after: {
-            -     adjacency: 'afterEnd',
-            -     insert: function(element, node) {
+            +   },
+            +   after: 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 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];
                   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 (Element.extend.refresh) Element.extend.refresh();
                 Element.cache = { };
               };
               document.viewport = {
                 getDimensions: function() {
-            -     var dimensions = { };
-            -     var B = Prototype.Browser;
+            +     var dimensions = { }, B = Prototype.Browser;
                   $w('width height').each(function(d) {
                     var D = d.capitalize();
-            -       dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] :
-            -         (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D];
+            +       if (B.WebKit && !document.evaluate) {
+            +         // 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;
                 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;
                   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.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;
                     '|=': "[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]",
-            -       'enabled':     "[not(@disabled)]",
+            +       'disabled':    "[(@disabled) and (@type!='hidden')]",
+            +       '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)) {
                 },
                 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";',
                   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)|(?=:))/,
-            -     attrPresence: /^\[([\w]+)\]/,
+            +     pseudo:
+            + /^:((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) {
                   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
                       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) {
-            -           n._counted = true;
+            +         if (!(n = nodes[i])._countedByPrototype) {
+            +           n._countedByPrototype = Prototype.emptyFunction;
                         results.push(Element.extend(n));
                       }
                     return Selector.handlers.unmark(results);
                   },
                   // COMBINATOR FUNCTIONS
                       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 (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);
                     }
                     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);
                     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);
                   }
                 },
                 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 = [];
-            -     exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-            -       expressions.push(m[1].strip());
-            -     });
+            +     expressions = Selector.split(expressions.join(','));
                   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 = {
                   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);
                         }
                   } catch (e) { }
                   return element;
                 },
                 disable: function(element) {
                   element = $(element);
-            -     element.blur();
                   element.disabled = true;
                   return element;
                 },
                 enable: function(element) {
                   element = $(element);
                 textarea: function(element, value) {
                   if (Object.isUndefined(value)) return element.value;
                   else element.value = value;
                 },
-            -   select: function(element, index) {
-            -     if (Object.isUndefined(index))
+            +   select: function(element, value) {
+            +     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 {
                   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;
-            -       return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
+            +       event = Event.extend(event);
+            +
+            +       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 },
                       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;
                 }
                   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 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);
                   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 || { };
                 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))

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