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: 779 inserted, 674 deleted

config/boot.rb ¶ +3 -2

                   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 << self
                     def rubygems_version
-            -         Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+            +         Gem::RubyGemsVersion rescue nil
                     end
                     def gem_version
                     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

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

               // Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-            - //           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+            + //           (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-            - //           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+            + //           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
               // Contributors:
               //  Richard Livsey
               //  Rahul Bhargava
               //  Rob Wills
-            - //
+            + //
               // script.aculo.us is freely distributable under the terms of an MIT-style license.
               // For details, see the script.aculo.us web site: http://script.aculo.us/
-            - // Autocompleter.Base handles all the autocompletion functionality
+            + // Autocompleter.Base handles all the autocompletion functionality
               // that's independent of the data source for autocompletion. This
               // includes drawing the autocompletion menu, observing keyboard
               // and mouse events, and similar.
               //
-            - // Specific autocompleters need to provide, at the very least,
+            + // Specific autocompleters need to provide, at the very least,
               // a getUpdatedChoices function that will be invoked every time
-            - // the text inside the monitored textbox changes. This method
+            + // the text inside the monitored textbox changes. This method
               // should get the text for which to provide autocompletion by
               // invoking this.getToken(), NOT by directly accessing
               // this.element.value. This is to allow incremental tokenized
               // will incrementally autocomplete with a comma as the token.
               // Additionally, ',' in the above example can be replaced with
               // a token array, e.g. { tokens: [',', '\n'] } which
-            - // enables autocompletion on multiple tokens. This is most
+            + // enables autocompletion on multiple tokens. This is most
-            - // useful when one of the tokens is \n (a newline), as it
+            + // 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.element     = element;
-            -     this.update      = $(update);
+            +     this.update      = $(update);
-            -     this.hasFocus    = false;
+            +     this.hasFocus    = false;
-            -     this.changed     = false;
+            +     this.changed     = false;
-            -     this.active      = false;
+            +     this.active      = false;
-            -     this.index       = 0;
+            +     this.index       = 0;
                   this.entryCount  = 0;
                   this.oldElementValue = this.element.value;
                   this.options.tokens       = this.options.tokens || [];
                   this.options.frequency    = this.options.frequency || 0.4;
                   this.options.minChars     = this.options.minChars || 1;
-            -     this.options.onShow       = this.options.onShow ||
+            +     this.options.onShow       = this.options.onShow ||
-            -       function(element, update){
+            +       function(element, update){
                       if(!update.style.position || update.style.position=='absolute') {
                         update.style.position = 'absolute';
                         Position.clone(element, update, {
-            -             setHeight: false,
+            +             setHeight: false,
                           offsetTop: element.offsetHeight
                         });
                       }
                       Effect.Appear(update,{duration:0.15});
                     };
-            -     this.options.onHide = this.options.onHide ||
+            +     this.options.onHide = this.options.onHide ||
                     function(element, update){ new Effect.Fade(update,{duration:0.15}) };
-            -     if(typeof(this.options.tokens) == 'string')
+            +     if(typeof(this.options.tokens) == 'string')
                     this.options.tokens = new Array(this.options.tokens);
                   // Force carriage returns as token delimiters anyway
                   if (!this.options.tokens.include('\n'))
                     this.options.tokens.push('\n');
                   this.observer = null;
+            +
                   this.element.setAttribute('autocomplete','off');
                   Element.hide(this.update);
                 show: function() {
                   if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-            -     if(!this.iefix &&
+            +     if(!this.iefix &&
                     (Prototype.Browser.IE) &&
                     (Element.getStyle(this.update, 'position')=='absolute')) {
-            -       new Insertion.After(this.update,
+            +       new Insertion.After(this.update,
                      '<iframe id="' + this.update.id + '_iefix" '+
                      'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
                      'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
                   }
                   if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
                 },
+            +
                 fixIEOverlapping: function() {
                   Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
                   this.iefix.style.zIndex = 1;
                        Event.stop(event);
                        return;
                     }
-            -      else
+            +      else
-            -        if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
+            +        if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
                        (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
                   this.changed = true;
                   this.hasFocus = true;
                   if(this.observer) clearTimeout(this.observer);
-            -       this.observer =
+            +       this.observer =
                       setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
                 },
                 onHover: function(event) {
                   var element = Event.findElement(event, 'LI');
-            -     if(this.index != element.autocompleteIndex)
+            +     if(this.index != element.autocompleteIndex)
                   {
                       this.index = element.autocompleteIndex;
                       this.render();
                   }
                   Event.stop(event);
                 },
+            +
                 onClick: function(event) {
                   var element = Event.findElement(event, 'LI');
                   this.index = element.autocompleteIndex;
                   this.selectEntry();
                   this.hide();
                 },
+            +
                 onBlur: function(event) {
                   // needed to make click events working
                   setTimeout(this.hide.bind(this), 250);
                   this.hasFocus = false;
-            -     this.active = false;
+            +     this.active = false;
-            -   },
+            +   },
+            +
                 render: function() {
                   if(this.entryCount > 0) {
                     for (var i = 0; i < this.entryCount; i++)
-            -         this.index==i ?
+            +         this.index==i ?
-            -           Element.addClassName(this.getEntry(i),"selected") :
+            +           Element.addClassName(this.getEntry(i),"selected") :
                         Element.removeClassName(this.getEntry(i),"selected");
-            -       if(this.hasFocus) {
+            +       if(this.hasFocus) {
                       this.show();
                       this.active = true;
                     }
                     this.hide();
                   }
                 },
+            +
                 markPrevious: function() {
-            -     if(this.index > 0) this.index--
+            +     if(this.index > 0) this.index--;
                     else this.index = this.entryCount-1;
                   this.getEntry(this.index).scrollIntoView(true);
                 },
+            +
                 markNext: function() {
-            -     if(this.index < this.entryCount-1) this.index++
+            +     if(this.index < this.entryCount-1) this.index++;
                     else this.index = 0;
                   this.getEntry(this.index).scrollIntoView(false);
                 },
+            +
                 getEntry: function(index) {
                   return this.update.firstChild.childNodes[index];
                 },
+            +
                 getCurrentEntry: function() {
                   return this.getEntry(this.index);
                 },
+            +
                 selectEntry: function() {
                   this.active = false;
                   this.updateElement(this.getCurrentEntry());
                     if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
                   } else
                     value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+            +
                   var bounds = this.getTokenBounds();
                   if (bounds[0] != -1) {
                     var newValue = this.element.value.substr(0, bounds[0]);
                   }
                   this.oldElementValue = this.element.value;
                   this.element.focus();
+            +
                   if (this.options.afterUpdateElement)
                     this.options.afterUpdateElement(this.element, selectedElement);
                 },
                     Element.cleanWhitespace(this.update.down());
                     if(this.update.firstChild && this.update.down().childNodes) {
-            -         this.entryCount =
+            +         this.entryCount =
                         this.update.down().childNodes.length;
                       for (var i = 0; i < this.entryCount; i++) {
                         var entry = this.getEntry(i);
                         entry.autocompleteIndex = i;
                         this.addObservers(entry);
                       }
-            -       } else {
+            +       } else {
                       this.entryCount = 0;
                     }
                     this.stopIndicator();
                     this.index = 0;
+            +
                     if(this.entryCount==1 && this.options.autoSelect) {
                       this.selectEntry();
                       this.hide();
                 },
                 onObserverEvent: function() {
-            -     this.changed = false;
+            +     this.changed = false;
                   this.tokenBounds = null;
                   if(this.getToken().length>=this.options.minChars) {
                     this.getUpdatedChoices();
                 getUpdatedChoices: function() {
                   this.startIndicator();
+            +
-            -     var entry = encodeURIComponent(this.options.paramName) + '=' +
+            +     var entry = encodeURIComponent(this.options.paramName) + '=' +
                     encodeURIComponent(this.getToken());
                   this.options.parameters = this.options.callback ?
                     this.options.callback(this.element, entry) : entry;
-            -     if(this.options.defaultParams)
+            +     if(this.options.defaultParams)
                     this.options.parameters += '&' + this.options.defaultParams;
+            +
                   new Ajax.Request(this.url, this.options);
                 },
               // - choices - How many autocompletion choices to offer
               //
               // - partialSearch - If false, the autocompleter will match entered
-            - //                    text only at the beginning of strings in the
+            + //                    text only at the beginning of strings in the
               //                    autocomplete array. Defaults to true, which will
               //                    match text at the beginning of any *word* in the
               //                    strings in the autocomplete array. If you want to
               // - ignoreCase - Whether to ignore case when autocompleting.
               //                 Defaults to true.
               //
-            - // It's possible to pass in a custom function as the 'selector'
+            + // It's possible to pass in a custom function as the 'selector'
               // option, if you prefer to write your own autocompletion logic.
               // In that case, the other options above will not apply unless
               // you support them.
                       var entry     = instance.getToken();
                       var count     = 0;
-            -         for (var i = 0; i < instance.options.array.length &&
+            +         for (var i = 0; i < instance.options.array.length &&
-            -           ret.length < instance.options.choices ; i++) {
+            +           ret.length < instance.options.choices ; i++) {
                         var elem = instance.options.array[i];
-            -           var foundPos = instance.options.ignoreCase ?
+            +           var foundPos = instance.options.ignoreCase ?
-            -             elem.toLowerCase().indexOf(entry.toLowerCase()) :
+            +             elem.toLowerCase().indexOf(entry.toLowerCase()) :
                           elem.indexOf(entry);
                         while (foundPos != -1) {
-            -             if (foundPos == 0 && elem.length != entry.length) {
+            +             if (foundPos == 0 && elem.length != entry.length) {
-            -               ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
+            +               ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
                               elem.substr(entry.length) + "</li>");
                             break;
-            -             } else if (entry.length >= instance.options.partialChars &&
+            +             } else if (entry.length >= instance.options.partialChars &&
                             instance.options.partialSearch && foundPos != -1) {
                             if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
                               partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
                             }
                           }
-            -             foundPos = instance.options.ignoreCase ?
+            +             foundPos = instance.options.ignoreCase ?
-            -               elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
+            +               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 || { });
                 setTimeout(function() {
                   Field.activate(field);
                 }, 1);
-            - }
+            + };
               Ajax.InPlaceEditor = Class.create({
                 initialize: function(element, url, options) {
                   this.triggerCallback('onEnterHover');
                 },
                 getText: function() {
-            -     return this.element.innerHTML;
+            +     return this.element.innerHTML.unescapeHTML();
                 },
                 handleAJAXFailure: function(transport) {
                   this.triggerCallback('onFailure', transport);
                     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),
                 loadingCollectionText: 'Loading options...'
               };
-            - // Delayed observer, like Form.Element.Observer,
+            + // Delayed observer, like Form.Element.Observer,
               // but waits for delay after last key input
               // Ideal for live-search fields
                   this.element   = $(element);
                   this.callback  = callback;
                   this.timer     = null;
-            -     this.lastValue = $F(this.element);
+            +     this.lastValue = $F(this.element);
                   Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
                 },
                 delayedListener: function(event) {
                   this.timer = null;
                   this.callback(this.element, $F(this.element));
                 }
-            - });
+            + });
  No newline at end of file

public/javascripts/dragdrop.js ¶ +165 -164

               // 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/
                       options._containers.push($(containment));
                     }
                   }
+            +
                   if(options.accept) options.accept = [options.accept].flatten();
                   Element.makePositioned(element); // fix IE
                   this.drops.push(options);
                 },
+            +
                 findDeepestChild: function(drops) {
                   deepest = drops[0];
+            +
                   for (i = 1; i < drops.length; ++i)
                     if (Element.isParent(drops[i].element, deepest.element))
                       deepest = drops[i];
+            +
                   return deepest;
                 },
                 isContained: function(element, drop) {
                   var containmentNode;
                   if(drop.tree) {
-            -       containmentNode = element.treeNode;
+            +       containmentNode = element.treeNode;
                   } else {
                     containmentNode = element.parentNode;
                   }
                   return drop._containers.detect(function(c) { return containmentNode == c });
                 },
+            +
                 isAffected: function(point, element, drop) {
                   return (
                     (drop.element!=element) &&
                     ((!drop._containers) ||
                       this.isContained(element, drop)) &&
                     ((!drop.accept) ||
-            -         (Element.classNames(element).detect(
+            +         (Element.classNames(element).detect(
                         function(v) { return drop.accept.include(v) } ) )) &&
                     Position.within(drop.element, point[0], point[1]) );
                 },
                 show: function(point, element) {
                   if(!this.drops.length) return;
                   var drop, affected = [];
+            +
                   this.drops.each( function(drop) {
                     if(Droppables.isAffected(point, element, drop))
                       affected.push(drop);
                   });
+            +
                   if(affected.length>0)
                     drop = Droppables.findDeepestChild(affected);
                     Position.within(drop.element, point[0], point[1]);
                     if(drop.onHover)
                       drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
+            +
                     if (drop != this.last_active) Droppables.activate(drop);
                   }
                 },
                   if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
                     if (this.last_active.onDrop) {
-            -         this.last_active.onDrop(element, this.last_active.element, event);
+            +         this.last_active.onDrop(element, this.last_active.element, event);
-            -         return true;
+            +         return true;
                     }
                 },
                   if(this.last_active)
                     this.deactivate(this.last_active);
                 }
-            - }
+            + };
               var Draggables = {
                 drags: [],
                 observers: [],
+            +
                 register: function(draggable) {
                   if(this.drags.length == 0) {
                     this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
                     this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
                     this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+            +
                     Event.observe(document, "mouseup", this.eventMouseUp);
                     Event.observe(document, "mousemove", this.eventMouseMove);
                     Event.observe(document, "keypress", this.eventKeypress);
                   }
                   this.drags.push(draggable);
                 },
+            +
                 unregister: function(draggable) {
                   this.drags = this.drags.reject(function(d) { return d==draggable });
                   if(this.drags.length == 0) {
                     Event.stopObserving(document, "keypress", this.eventKeypress);
                   }
                 },
+            +
                 activate: function(draggable) {
-            -     if(draggable.options.delay) {
+            +     if(draggable.options.delay) {
-            -       this._timeout = setTimeout(function() {
+            +       this._timeout = setTimeout(function() {
-            -         Draggables._timeout = null;
+            +         Draggables._timeout = null;
-            -         window.focus();
+            +         window.focus();
-            -         Draggables.activeDraggable = draggable;
+            +         Draggables.activeDraggable = draggable;
-            -       }.bind(this), draggable.options.delay);
+            +       }.bind(this), draggable.options.delay);
                   } else {
                     window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
                     this.activeDraggable = draggable;
                   }
                 },
+            +
                 deactivate: function() {
                   this.activeDraggable = null;
                 },
+            +
                 updateDrag: function(event) {
                   if(!this.activeDraggable) return;
                   var pointer = [Event.pointerX(event), Event.pointerY(event)];
                   // the same coordinates, prevent needless redrawing (moz bug?)
                   if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
                   this._lastPointer = pointer;
+            +
                   this.activeDraggable.updateDrag(event, pointer);
                 },
+            +
                 endDrag: function(event) {
-            -     if(this._timeout) {
+            +     if(this._timeout) {
-            -       clearTimeout(this._timeout);
+            +       clearTimeout(this._timeout);
-            -       this._timeout = null;
+            +       this._timeout = null;
                   }
                   if(!this.activeDraggable) return;
                   this._lastPointer = null;
                   this.activeDraggable.endDrag(event);
                   this.activeDraggable = null;
                 },
+            +
                 keyPress: function(event) {
                   if(this.activeDraggable)
                     this.activeDraggable.keyPress(event);
                 },
+            +
                 addObserver: function(observer) {
                   this.observers.push(observer);
                   this._cacheObserverCallbacks();
                 },
+            +
                 removeObserver: function(element) {  // element instead of observer fixes mem leaks
                   this.observers = this.observers.reject( function(o) { return o.element==element });
                   this._cacheObserverCallbacks();
                 },
+            +
                 notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
                   if(this[eventName+'Count'] > 0)
                     this.observers.each( function(o) {
                     });
                   if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
                 },
+            +
                 _cacheObserverCallbacks: function() {
                   ['onStart','onEnd','onDrag'].each( function(eventName) {
                     Draggables[eventName+'Count'] = Draggables.observers.select(
                     ).length;
                   });
                 }
-            - }
+            + };
               /*--------------------------------------------------------------------------*/
                     },
                     endeffect: function(element) {
                       var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
-            -         new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
+            +         new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
                         queue: {scope:'_draggable', position:'end'},
-            -           afterFinish: function(){
+            +           afterFinish: function(){
-            -             Draggable._dragging[element] = false
+            +             Draggable._dragging[element] = false
                         }
-            -         });
+            +         });
                     },
                     zindex: 1000,
                     revert: false,
                     snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
                     delay: 0
                   };
+            +
                   if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
                     Object.extend(defaults, {
                       starteffect: function(element) {
                         element._opacity = Element.getOpacity(element);
                         Draggable._dragging[element] = true;
-            -           new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
+            +           new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
                       }
                     });
+            +
                   var options = Object.extend(defaults, arguments[1] || { });
                   this.element = $(element);
+            +
                   if(options.handle && Object.isString(options.handle))
                     this.handle = this.element.down('.'+options.handle, 0);
+            +
                   if(!this.handle) this.handle = $(options.handle);
                   if(!this.handle) this.handle = this.element;
+            +
                   if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
                     options.scroll = $(options.scroll);
                     this._isScrollChild = Element.childOf(this.element, options.scroll);
                   }
-            -     Element.makePositioned(this.element); // fix IE
+            +     Element.makePositioned(this.element); // fix IE
                   this.options  = options;
-            -     this.dragging = false;
+            +     this.dragging = false;
                   this.eventMouseDown = this.initDrag.bindAsEventListener(this);
                   Event.observe(this.handle, "mousedown", this.eventMouseDown);
+            +
                   Draggables.register(this);
                 },
+            +
                 destroy: function() {
                   Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
                   Draggables.unregister(this);
                 },
+            +
                 currentDelta: function() {
                   return([
                     parseInt(Element.getStyle(this.element,'left') || '0'),
                     parseInt(Element.getStyle(this.element,'top') || '0')]);
                 },
+            +
                 initDrag: function(event) {
                   if(!Object.isUndefined(Draggable._dragging[this.element]) &&
                     Draggable._dragging[this.element]) return;
-            -     if(Event.isLeftClick(event)) {
+            +     if(Event.isLeftClick(event)) {
                     // abort on form elements, fixes a Firefox issue
                     var src = Event.element(event);
                     if((tag_name = src.tagName.toUpperCase()) && (
                       tag_name=='OPTION' ||
                       tag_name=='BUTTON' ||
                       tag_name=='TEXTAREA')) return;
+            +
                     var pointer = [Event.pointerX(event), Event.pointerY(event)];
                     var pos     = Position.cumulativeOffset(this.element);
                     this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
+            +
                     Draggables.activate(this);
                     Event.stop(event);
                   }
                 },
+            +
                 startDrag: function(event) {
                   this.dragging = true;
                   if(!this.delta)
                     this.delta = this.currentDelta();
+            +
                   if(this.options.zindex) {
                     this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
                     this.element.style.zIndex = this.options.zindex;
                   }
+            +
                   if(this.options.ghosting) {
                     this._clone = this.element.cloneNode(true);
-            -       this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+            +       this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
-            -       if (!this.element._originallyAbsolute)
+            +       if (!this._originallyAbsolute)
                       Position.absolutize(this.element);
                     this.element.parentNode.insertBefore(this._clone, this.element);
                   }
+            +
                   if(this.options.scroll) {
                     if (this.options.scroll == window) {
                       var where = this._getWindowScroll(this.options.scroll);
                       this.originalScrollTop = this.options.scroll.scrollTop;
                     }
                   }
+            +
                   Draggables.notify('onStart', this, event);
+            +
                   if(this.options.starteffect) this.options.starteffect(this.element);
                 },
+            +
                 updateDrag: function(event, pointer) {
                   if(!this.dragging) this.startDrag(event);
+            +
                   if(!this.options.quiet){
                     Position.prepare();
                     Droppables.show(pointer, this.element);
                   }
+            +
                   Draggables.notify('onDrag', this, event);
+            +
                   this.draw(pointer);
                   if(this.options.change) this.options.change(this);
+            +
                   if(this.options.scroll) {
                     this.stopScrolling();
+            +
                     var p;
                     if (this.options.scroll == window) {
                       with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
                     if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
                     this.startScrolling(speed);
                   }
+            +
                   // fix AppleWebKit rendering
                   if(Prototype.Browser.WebKit) window.scrollBy(0,0);
+            +
                   Event.stop(event);
                 },
+            +
                 finishDrag: function(event, success) {
                   this.dragging = false;
+            +
                   if(this.options.quiet){
                     Position.prepare();
                     var pointer = [Event.pointerX(event), Event.pointerY(event)];
                   }
                   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;
+            +     var dropped = false;
-            -     if(success) {
+            +     if(success) {
-            -       dropped = Droppables.fire(event, this.element);
+            +       dropped = Droppables.fire(event, this.element);
-            -       if (!dropped) dropped = false;
+            +       if (!dropped) dropped = false;
                   }
                   if(dropped && this.options.onDropped) this.options.onDropped(this.element);
                   Draggables.notify('onEnd', this, event);
                   var revert = this.options.revert;
                   if(revert && Object.isFunction(revert)) revert = revert(this.element);
+            +
                   var d = this.currentDelta();
                   if(revert && this.options.reverteffect) {
                     if (dropped == 0 || revert != 'failure')
                   if(this.options.zindex)
                     this.element.style.zIndex = this.originalZ;
-            -     if(this.options.endeffect)
+            +     if(this.options.endeffect)
                     this.options.endeffect(this.element);
+            +
                   Draggables.deactivate(this);
                   Droppables.reset();
                 },
+            +
                 keyPress: function(event) {
                   if(event.keyCode!=Event.KEY_ESC) return;
                   this.finishDrag(event, false);
                   Event.stop(event);
                 },
+            +
                 endDrag: function(event) {
                   if(!this.dragging) return;
                   this.stopScrolling();
                   this.finishDrag(event, true);
                   Event.stop(event);
                 },
+            +
                 draw: function(point) {
                   var pos = Position.cumulativeOffset(this.element);
                   if(this.options.ghosting) {
                     var r   = Position.realOffset(this.element);
                     pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
                   }
+            +
                   var d = this.currentDelta();
                   pos[0] -= d[0]; pos[1] -= d[1];
+            +
                   if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
                     pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
                     pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
                   }
+            +
-            -     var p = [0,1].map(function(i){
+            +     var p = [0,1].map(function(i){
-            -       return (point[i]-pos[i]-this.offset[i])
+            +       return (point[i]-pos[i]-this.offset[i])
                   }.bind(this));
+            +
                   if(this.options.snap) {
                     if(Object.isFunction(this.options.snap)) {
                       p = this.options.snap(p[0],p[1],this);
                     } else {
                     if(Object.isArray(this.options.snap)) {
                       p = p.map( function(v, i) {
-            -           return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
+            +           return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));
                     } else {
                       p = p.map( function(v) {
-            -           return (v/this.options.snap).round()*this.options.snap }.bind(this))
+            +           return (v/this.options.snap).round()*this.options.snap }.bind(this));
                     }
                   }}
+            +
                   var style = this.element.style;
                   if((!this.options.constraint) || (this.options.constraint=='horizontal'))
                     style.left = p[0] + "px";
                   if((!this.options.constraint) || (this.options.constraint=='vertical'))
                     style.top  = p[1] + "px";
+            +
                   if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
                 },
+            +
                 stopScrolling: function() {
                   if(this.scrollInterval) {
                     clearInterval(this.scrollInterval);
                     Draggables._lastScrollPointer = null;
                   }
                 },
+            +
                 startScrolling: function(speed) {
                   if(!(speed[0] || speed[1])) return;
                   this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
                   this.lastScrolled = new Date();
                   this.scrollInterval = setInterval(this.scroll.bind(this), 10);
                 },
+            +
                 scroll: function() {
                   var current = new Date();
                   var delta = current - this.lastScrolled;
                     this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
                     this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
                   }
+            +
                   Position.prepare();
                   Droppables.show(Draggables._lastPointer, this.element);
                   Draggables.notify('onDrag', this);
                       Draggables._lastScrollPointer[1] = 0;
                     this.draw(Draggables._lastScrollPointer);
                   }
+            +
                   if(this.options.change) this.options.change(this);
                 },
+            +
                 _getWindowScroll: function(w) {
                   var T, L, W, H;
                   with (w.document) {
                       H = documentElement.clientHeight;
                     } else {
                       W = body.offsetWidth;
-            -         H = body.offsetHeight
+            +         H = body.offsetHeight;
                     }
                   }
                   return { top: T, left: L, width: W, height: H };
                   this.observer  = observer;
                   this.lastValue = Sortable.serialize(this.element);
                 },
+            +
                 onStart: function() {
                   this.lastValue = Sortable.serialize(this.element);
                 },
+            +
                 onEnd: function() {
                   Sortable.unmark();
                   if(this.lastValue != Sortable.serialize(this.element))
               var Sortable = {
                 SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
+            +
                 sortables: { },
+            +
                 _findRootElement: function(element) {
-            -     while (element.tagName.toUpperCase() != "BODY") {
+            +     while (element.tagName.toUpperCase() != "BODY") {
                     if(element.id && Sortable.sortables[element.id]) return element;
                     element = element.parentNode;
                   }
                   if(!element) return;
                   return Sortable.sortables[element.id];
                 },
+            +
                 destroy: function(element){
-            -     var s = Sortable.options(element);
+            +     element = $(element);
+            +     var s = Sortable.sortables[element.id];
+            +
                   if(s) {
                     Draggables.removeObserver(s.element);
                     s.droppables.each(function(d){ Droppables.remove(d) });
                     s.draggables.invoke('destroy');
+            +
                     delete Sortable.sortables[s.element.id];
                   }
                 },
                 create: function(element) {
                   element = $(element);
-            -     var options = Object.extend({
+            +     var options = Object.extend({
                     element:     element,
                     tag:         'li',       // assumes li children, override with tag: 'tagname'
                     dropOnEmpty: false,
                     delay:       0,
                     hoverclass:  null,
                     ghosting:    false,
-            -       quiet:       false,
+            +       quiet:       false,
                     scroll:      false,
                     scrollSensitivity: 20,
                     scrollSpeed: 15,
                     format:      this.SERIALIZE_RULE,
+            +
-            -       // these take arrays of elements or ids and can be
+            +       // these take arrays of elements or ids and can be
                     // used for better initialization performance
                     elements:    false,
                     handles:     false,
+            +
                     onChange:    Prototype.emptyFunction,
                     onUpdate:    Prototype.emptyFunction
                   }, arguments[1] || { });
                   if(options.zindex)
                     options_for_draggable.zindex = options.zindex;
-            -     // build options for the droppables
+            +     // build options for the droppables
                   var options_for_droppable = {
                     overlap:     options.overlap,
                     containment: options.containment,
                     tree:        options.tree,
                     hoverclass:  options.hoverclass,
                     onHover:     Sortable.onHover
-            -     }
+            +     };
+            +
                   var options_for_tree = {
                     onHover:      Sortable.onEmptyHover,
                     overlap:      options.overlap,
                     containment:  options.containment,
                     hoverclass:   options.hoverclass
-            -     }
+            +     };
                   // fix for gecko engine
-            -     Element.cleanWhitespace(element);
+            +     Element.cleanWhitespace(element);
                   options.draggables = [];
                   options.droppables = [];
                   (options.elements || this.findElements(element, options) || []).each( function(e,i) {
                     var handle = options.handles ? $(options.handles[i]) :
-            -         (options.handle ? $(e).select('.' + options.handle)[0] : e);
+            +         (options.handle ? $(e).select('.' + options.handle)[0] : e);
                     options.draggables.push(
                       new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
                     Droppables.add(e, options_for_droppable);
                     if(options.tree) e.treeNode = element;
-            -       options.droppables.push(e);
+            +       options.droppables.push(e);
                   });
+            +
                   if(options.tree) {
                     (Sortable.findTreeElements(element, options) || []).each( function(e) {
                       Droppables.add(e, options_for_tree);
                   return Element.findChildren(
                     element, options.only, options.tree ? true : false, options.tag);
                 },
+            +
                 findTreeElements: function(element, options) {
                   return Element.findChildren(
                     element, options.only, options.tree ? true : false, options.treeTag);
                       var oldParentNode = element.parentNode;
                       element.style.visibility = "hidden"; // fix gecko rendering
                       dropon.parentNode.insertBefore(element, dropon);
-            -         if(dropon.parentNode!=oldParentNode)
+            +         if(dropon.parentNode!=oldParentNode)
                         Sortable.options(oldParentNode).onChange(element);
                       Sortable.options(dropon.parentNode).onChange(element);
                     }
                       var oldParentNode = element.parentNode;
                       element.style.visibility = "hidden"; // fix gecko rendering
                       dropon.parentNode.insertBefore(element, nextElement);
-            -         if(dropon.parentNode!=oldParentNode)
+            +         if(dropon.parentNode!=oldParentNode)
                         Sortable.options(oldParentNode).onChange(element);
                       Sortable.options(dropon.parentNode).onChange(element);
                     }
                   }
                 },
+            +
                 onEmptyHover: function(element, dropon, overlap) {
                   var oldParentNode = element.parentNode;
                   var droponOptions = Sortable.options(dropon);
+            +
                   if(!Element.isParent(dropon, element)) {
                     var index;
+            +
                     var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
                     var child = null;
+            +
                     if(children) {
                       var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
+            +
                       for (index = 0; index < children.length; index += 1) {
                         if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
                           offset -= Element.offsetSize (children[index], droponOptions.overlap);
                         }
                       }
                     }
+            +
                     dropon.insertBefore(element, child);
+            +
                     Sortable.options(oldParentNode).onChange(element);
                     droponOptions.onChange(element);
                   }
                 mark: function(dropon, position) {
                   // mark on ghosting only
                   var sortable = Sortable.options(dropon.parentNode);
-            -     if(sortable && !sortable.ghosting) return;
+            +     if(sortable && !sortable.ghosting) return;
                   if(!Sortable._marker) {
-            -       Sortable._marker =
+            +       Sortable._marker =
                       ($('dropmarker') || Element.extend(document.createElement('DIV'))).
                         hide().addClassName('dropmarker').setStyle({position:'absolute'});
                     document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
-            -     }
+            +     }
                   var offsets = Position.cumulativeOffset(dropon);
                   Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
+            +
                   if(position=='after')
-            -       if(sortable.overlap == 'horizontal')
+            +       if(sortable.overlap == 'horizontal')
                       Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
                     else
                       Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
+            +
                   Sortable._marker.show();
                 },
+            +
                 _tree: function(element, options, parent) {
                   var children = Sortable.findElements(element, options) || [];
+            +
                   for (var i = 0; i < children.length; ++i) {
                     var match = children[i].id.match(options.format);
                     if (!match) continue;
+            +
                     var child = {
                       id: encodeURIComponent(match ? match[1] : null),
                       element: element,
                       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;
+            +     return parent;
                 },
                 tree: function(element) {
                     name: element.id,
                     format: sortableOptions.format
                   }, arguments[1] || { });
+            +
                   var root = {
                     id: null,
                     parent: null,
                     children: [],
                     container: element,
                     position: 0
-            -     }
+            +     };
+            +
                   return Sortable._tree(element, options, root);
                 },
                 sequence: function(element) {
                   element = $(element);
                   var options = Object.extend(this.options(element), arguments[1] || { });
+            +
                   return $(this.findElements(element, options) || []).map( function(item) {
                     return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
                   });
                 setSequence: function(element, new_sequence) {
                   element = $(element);
                   var options = Object.extend(this.options(element), arguments[2] || { });
+            +
                   var nodeMap = { };
                   this.findElements(element, options).each( function(n) {
                       if (n.id.match(options.format))
                           nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
                       n.parentNode.removeChild(n);
                   });
+            +
                   new_sequence.each(function(ident) {
                     var n = nodeMap[ident];
                     if (n) {
                     }
                   });
                 },
+            +
                 serialize: function(element) {
                   element = $(element);
                   var options = Object.extend(Sortable.options(element), arguments[1] || { });
                   var name = encodeURIComponent(
                     (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
+            +
                   if (options.tree) {
                     return Sortable.tree(element, arguments[1]).children.map( function (item) {
-            -         return [name + Sortable._constructIndex(item) + "[id]=" +
+            +         return [name + Sortable._constructIndex(item) + "[id]=" +
                               encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
                     }).flatten().join('&');
                   } else {
                     }).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) {
+            + Element.findChildren = function(element, only, recursive, tagName) {
                 if(!element.hasChildNodes()) return null;
                 tagName = tagName.toUpperCase();
                 if(only) only = [only].flatten();
                 });
                 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 ¶ +173 -165

               //  Justin Palmer (http://encytemedia.com/)
               //  Mark Pilgrim (http://diveintomark.org/)
               //  Martin Bialasinki
-            - //
+            + //
               // 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/
+            + // For details, see the script.aculo.us web site: http://script.aculo.us/
-            - // converts rgb() and #xxx to #xxxxxx format,
+            + // converts rgb() and #xxx to #xxxxxx format,
-            - // returns self (or first argument) if not convertable
+            + // returns self (or first argument) if not convertable
-            - String.prototype.parseColor = function() {
+            + String.prototype.parseColor = function() {
                 var color = '#';
-            -   if (this.slice(0,4) == 'rgb(') {
+            +   if (this.slice(0,4) == 'rgb(') {
-            -     var cols = this.slice(4,this.length-1).split(',');
+            +     var cols = this.slice(4,this.length-1).split(',');
-            -     var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
+            +     var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
-            -   } else {
+            +   } else {
-            -     if (this.slice(0,1) == '#') {
+            +     if (this.slice(0,1) == '#') {
-            -       if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
+            +       if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
-            -       if (this.length==7) color = this.toLowerCase();
+            +       if (this.length==7) color = this.toLowerCase();
-            -     }
+            +     }
-            -   }
+            +   }
-            -   return (color.length==7 ? color : (arguments[0] || this));
+            +   return (color.length==7 ? color : (arguments[0] || this));
               };
               /*--------------------------------------------------------------------------*/
-            - Element.collectTextNodes = function(element) {
+            + Element.collectTextNodes = function(element) {
                 return $A($(element).childNodes).collect( function(node) {
-            -     return (node.nodeType==3 ? node.nodeValue :
+            +     return (node.nodeType==3 ? node.nodeValue :
                     (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
                 }).flatten().join('');
               };
-            - Element.collectTextNodesIgnoreClass = function(element, className) {
+            + Element.collectTextNodesIgnoreClass = function(element, className) {
                 return $A($(element).childNodes).collect( function(node) {
-            -     return (node.nodeType==3 ? node.nodeValue :
+            +     return (node.nodeType==3 ? node.nodeValue :
-            -       ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
+            +       ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
                       Element.collectTextNodesIgnoreClass(node, className) : ''));
                 }).flatten().join('');
               };
               Element.setContentZoom = function(element, percent) {
-            -   element = $(element);
+            +   element = $(element);
-            -   element.setStyle({fontSize: (percent/100) + 'em'});
+            +   element.setStyle({fontSize: (percent/100) + 'em'});
                 if (Prototype.Browser.WebKit) window.scrollBy(0,0);
                 return element;
               };
                 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) {
+            +     pulse: function(pos, pulses) {
-            -       pulses = pulses || 5;
+            +       return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
-            -       return (
-            -         ((pos % (1/pulses)) * pulses).round() == 0 ?
-            -               ((pos * pulses * 2) - (pos * pulses * 2).floor()) :
-            -           1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
-            -         );
                   },
-            -     spring: function(pos) {
+            +     spring: function(pos) {
-            -       return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
+            +       return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
                   },
                   none: function(pos) {
                     return 0;
                 tagifyText: function(element) {
                   var tagifyStyle = 'position:relative';
                   if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
+            +
                   element = $(element);
                   $A(element.childNodes).each( function(child) {
                     if (child.nodeType==3) {
                       child.nodeValue.toArray().each( function(character) {
                         element.insertBefore(
                           new Element('span', {style: tagifyStyle}).update(
-            -               character == ' ' ? String.fromCharCode(160) : character),
+            +               character == ' ' ? String.fromCharCode(160) : character),
                             child);
                       });
                       Element.remove(child);
                 },
                 multiple: function(element, effect) {
                   var elements;
-            -     if (((typeof element == 'object') ||
+            +     if (((typeof element == 'object') ||
-            -         Object.isFunction(element)) &&
+            +         Object.isFunction(element)) &&
                      (element.length))
                     elements = element;
                   else
                     elements = $(element).childNodes;
+            +
                   var options = Object.extend({
                     speed: 0.1,
                     delay: 0.0
                   var options = Object.extend({
                     queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
                   }, arguments[2] || { });
-            -     Effect[element.visible() ?
+            +     Effect[element.visible() ?
                     Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
                 }
               };
               Effect.ScopedQueue = Class.create(Enumerable, {
                 initialize: function() {
                   this.effects  = [];
-            -     this.interval = null;
+            +     this.interval = null;
                 },
                 _each: function(iterator) {
                   this.effects._each(iterator);
                 },
                 add: function(effect) {
                   var timestamp = new Date().getTime();
+            +
-            -     var position = Object.isString(effect.options.queue) ?
+            +     var position = Object.isString(effect.options.queue) ?
                     effect.options.queue : effect.options.queue.position;
+            +
                   switch(position) {
                     case 'front':
-            -         // move unstarted effects after this effect
+            +         // move unstarted effects after this effect
                       this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
                           e.startOn  += effect.finishOn;
                           e.finishOn += effect.finishOn;
                       timestamp = this.effects.pluck('finishOn').max() || timestamp;
                       break;
                   }
+            +
                   effect.startOn  += timestamp;
                   effect.finishOn += timestamp;
                   if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
                     this.effects.push(effect);
+            +
                   if (!this.interval)
                     this.interval = setInterval(this.loop.bind(this), 15);
                 },
                 },
                 loop: function() {
                   var timePos = new Date().getTime();
-            -     for(var i=0, len=this.effects.length;i<len;i++)
+            +     for(var i=0, len=this.effects.length;i<len;i++)
                     this.effects[i] && this.effects[i].loop(timePos);
                 }
               });
                 instances: $H(),
                 get: function(queueName) {
                   if (!Object.isString(queueName)) return queueName;
+            +
                   return this.instances.get(queueName) ||
                     this.instances.set(queueName, new Effect.ScopedQueue());
                 }
                   this.fromToDelta  = this.options.to-this.options.from;
                   this.totalTime    = this.finishOn-this.startOn;
                   this.totalFrames  = this.options.fps*this.options.duration;
+            +
-            -     eval('this.render = function(pos){ '+
+            +     this.render = (function() {
-            -       'if (this.state=="idle"){this.state="running";'+
+            +       function dispatch(effect, eventName) {
-            -       codeForEvent(this.options,'beforeSetup')+
+            +         if (effect.options[eventName + 'Internal'])
-            -       (this.setup ? 'this.setup();':'')+
+            +           effect.options[eventName + 'Internal'](effect);
-            -       codeForEvent(this.options,'afterSetup')+
+            +         if (effect.options[eventName])
-            -       '};if (this.state=="running"){'+
+            +           effect.options[eventName](effect);
-            -       'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
+            +       }
-            -       'this.position=pos;'+
-            -       codeForEvent(this.options,'beforeUpdate')+
+            +       return function(pos) {
-            -       (this.update ? 'this.update(pos);':'')+
+            +         if (this.state === "idle") {
-            -       codeForEvent(this.options,'afterUpdate')+
+            +           this.state = "running";
-            -       '}}');
+            +           dispatch(this, 'beforeSetup');
+            +           if (this.setup) this.setup();
+            +           dispatch(this, 'afterSetup');
+            +         }
+            +         if (this.state === "running") {
+            +           pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
+            +           this.position = pos;
+            +           dispatch(this, 'beforeUpdate');
+            +           if (this.update) this.update(pos);
+            +           dispatch(this, 'afterUpdate');
+            +         }
+            +       };
+            +     })();
+            +
                   this.event('beforeStart');
                   if (!this.options.sync)
-            -       Effect.Queues.get(Object.isString(this.options.queue) ?
+            +       Effect.Queues.get(Object.isString(this.options.queue) ?
                       'global' : this.options.queue.scope).add(this);
                 },
                 loop: function(timePos) {
                       this.render(1.0);
                       this.cancel();
                       this.event('beforeFinish');
-            -         if (this.finish) this.finish();
+            +         if (this.finish) this.finish();
                       this.event('afterFinish');
-            -         return;
+            +         return;
                     }
                     var pos   = (timePos - this.startOn) / this.totalTime,
                         frame = (pos * this.totalFrames).round();
                 },
                 cancel: function() {
                   if (!this.options.sync)
-            -       Effect.Queues.get(Object.isString(this.options.queue) ?
+            +       Effect.Queues.get(Object.isString(this.options.queue) ?
                       'global' : this.options.queue.scope).remove(this);
                   this.state = 'finished';
                 },
               Effect.Tween = Class.create(Effect.Base, {
                 initialize: function(object, from, to) {
                   object = Object.isString(object) ? $(object) : object;
-            -     var args = $A(arguments), method = args.last(),
+            +     var args = $A(arguments), method = args.last(),
                     options = args.length == 5 ? args[3] : null;
                   this.method = Object.isFunction(method) ? method.bind(object) :
-            -       Object.isFunction(object[method]) ? object[method].bind(object) :
+            +       Object.isFunction(object[method]) ? object[method].bind(object) :
                     function(value) { object[method] = value };
                   this.start(Object.extend({ from: from, to: to }, options || { }));
                 },
               // for backwards compatibility
               Effect.MoveBy = function(element, toTop, toLeft) {
-            -   return new Effect.Move(element,
+            +   return new Effect.Move(element,
                   Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
               };
                 setup: function() {
                   this.restoreAfterFinish = this.options.restoreAfterFinish || false;
                   this.elementPositioning = this.element.getStyle('position');
+            +
                   this.originalStyle = { };
                   ['top','left','width','height','fontSize'].each( function(k) {
                     this.originalStyle[k] = this.element.style[k];
                   }.bind(this));
+            +
                   this.originalTop  = this.element.offsetTop;
                   this.originalLeft = this.element.offsetLeft;
+            +
                   var fontSize = this.element.getStyle('font-size') || '100%';
                   ['em','px','%','pt'].each( function(fontSizeType) {
                     if (fontSize.indexOf(fontSizeType)>0) {
                       this.fontSizeType = fontSizeType;
                     }
                   }.bind(this));
+            +
                   this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
+            +
                   this.dims = null;
                   if (this.options.scaleMode=='box')
                     this.dims = [this.element.offsetHeight, this.element.offsetWidth];
               Effect.ScrollTo = function(element) {
                 var options = arguments[1] || { },
-            -     scrollOffsets = document.viewport.getScrollOffsets(),
+            +   scrollOffsets = document.viewport.getScrollOffsets(),
-            -     elementOffsets = $(element).cumulativeOffset(),
+            +   elementOffsets = $(element).cumulativeOffset();
-            -     max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();
                 if (options.offset) elementOffsets[1] += options.offset;
                 return new Effect.Tween(null,
                   scrollOffsets.top,
-            -     elementOffsets[1] > max ? max : elementOffsets[1],
+            +     elementOffsets[1],
                   options,
-            -     function(p){ scrollTo(scrollOffsets.left, p.round()) }
+            +     function(p){ scrollTo(scrollOffsets.left, p.round()); }
                 );
               };
                 var options = Object.extend({
                   from: element.getOpacity() || 1.0,
                   to:   0.0,
-            -     afterFinishInternal: function(effect) {
+            +     afterFinishInternal: function(effect) {
                     if (effect.options.to!=0) return;
-            -       effect.element.hide().setStyle({opacity: oldOpacity});
+            +       effect.element.hide().setStyle({opacity: oldOpacity});
                   }
                 }, arguments[1] || { });
                 return new Effect.Opacity(element,options);
                   effect.element.forceRerendering();
                 },
                 beforeSetup: function(effect) {
-            -     effect.element.setOpacity(effect.options.from).show();
+            +     effect.element.setOpacity(effect.options.from).show();
                 }}, arguments[1] || { });
                 return new Effect.Opacity(element,options);
               };
               Effect.Puff = function(element) {
                 element = $(element);
-            -   var oldStyle = {
+            +   var oldStyle = {
-            -     opacity: element.getInlineOpacity(),
+            +     opacity: element.getInlineOpacity(),
                   position: element.getStyle('position'),
                   top:  element.style.top,
                   left: element.style.left,
                   height: element.style.height
                 };
                 return new Effect.Parallel(
-            -    [ new Effect.Scale(element, 200,
+            +    [ new Effect.Scale(element, 200,
-            -       { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
+            +       { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
-            -      new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
+            +      new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
-            -      Object.extend({ duration: 1.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); }
                 element = $(element);
                 element.makeClipping();
                 return new Effect.Scale(element, 0,
-            -     Object.extend({ scaleContent: false,
+            +     Object.extend({ scaleContent: false,
-            -       scaleX: false,
+            +       scaleX: false,
                     restoreAfterFinish: true,
                     afterFinishInternal: function(effect) {
                       effect.element.hide().undoClipping();
-            -       }
+            +       }
                   }, arguments[1] || { })
                 );
               };
               Effect.BlindDown = function(element) {
                 element = $(element);
                 var elementDimensions = element.getDimensions();
-            -   return new Effect.Scale(element, 100, Object.extend({
+            +   return new Effect.Scale(element, 100, Object.extend({
-            -     scaleContent: false,
+            +     scaleContent: false,
                   scaleX: false,
                   scaleFrom: 0,
                   scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
                   restoreAfterFinish: true,
                   afterSetup: function(effect) {
-            -       effect.element.makeClipping().setStyle({height: '0px'}).show();
+            +       effect.element.makeClipping().setStyle({height: '0px'}).show();
-            -     },
+            +     },
                   afterFinishInternal: function(effect) {
                     effect.element.undoClipping();
                   }
                   from: 0,
                   transition: Effect.Transitions.flicker,
                   afterFinishInternal: function(effect) {
-            -       new Effect.Scale(effect.element, 1, {
+            +       new Effect.Scale(effect.element, 1, {
                       duration: 0.3, scaleFromCenter: true,
                       scaleX: false, scaleContent: false, restoreAfterFinish: true,
-            -         beforeSetup: function(effect) {
+            +         beforeSetup: function(effect) {
                         effect.element.makePositioned().makeClipping();
                       },
                       afterFinishInternal: function(effect) {
                         effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
                       }
-            -       })
+            +       });
                   }
                 }, arguments[1] || { }));
               };
                   left: element.getStyle('left'),
                   opacity: element.getInlineOpacity() };
                 return new Effect.Parallel(
-            -     [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
+            +     [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
                     new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
                   Object.extend(
                     { duration: 0.5,
                       beforeSetup: function(effect) {
-            -           effect.effects[0].element.makePositioned();
+            +           effect.effects[0].element.makePositioned();
                       },
                       afterFinishInternal: function(effect) {
                         effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
-            -         }
+            +         }
                     }, arguments[1] || { }));
               };
                   new Effect.Move(effect.element,
                     { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
                       effect.element.undoPositioned().setStyle(oldStyle);
-            -   }}) }}) }}) }}) }}) }});
+            +   }}); }}); }}); }}); }}); }});
               };
               Effect.SlideDown = function(element) {
                 // SlideDown need to have the content of the element wrapped in a container element with fixed height!
                 var oldInnerBottom = element.down().getStyle('bottom');
                 var elementDimensions = element.getDimensions();
-            -   return new Effect.Scale(element, 100, Object.extend({
+            +   return new Effect.Scale(element, 100, Object.extend({
-            -     scaleContent: false,
+            +     scaleContent: false,
-            -     scaleX: false,
+            +     scaleX: false,
                   scaleFrom: window.opera ? 0 : 1,
                   scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
                   restoreAfterFinish: true,
                     effect.element.makePositioned();
                     effect.element.down().makePositioned();
                     if (window.opera) effect.element.setStyle({top: ''});
-            -       effect.element.makeClipping().setStyle({height: '0px'}).show();
+            +       effect.element.makeClipping().setStyle({height: '0px'}).show();
                   },
                   afterUpdateInternal: function(effect) {
                     effect.element.down().setStyle({bottom:
-            -         (effect.dims[0] - effect.element.clientHeight) + 'px' });
+            +         (effect.dims[0] - effect.element.clientHeight) + 'px' });
                   },
                   afterFinishInternal: function(effect) {
                     effect.element.undoClipping().undoPositioned();
                 var oldInnerBottom = element.down().getStyle('bottom');
                 var elementDimensions = element.getDimensions();
                 return new Effect.Scale(element, window.opera ? 0 : 1,
-            -    Object.extend({ scaleContent: false,
+            +    Object.extend({ scaleContent: false,
-            -     scaleX: false,
+            +     scaleX: false,
                   scaleMode: 'box',
                   scaleFrom: 100,
                   scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
                     effect.element.down().makePositioned();
                     if (window.opera) effect.element.setStyle({top: ''});
                     effect.element.makeClipping().show();
-            -     },
+            +     },
                   afterUpdateInternal: function(effect) {
                     effect.element.down().setStyle({bottom:
                       (effect.dims[0] - effect.element.clientHeight) + 'px' });
                 );
               };
-            - // Bug in opera makes the TD containing this element expand for a instance after finish
+            + // Bug in opera makes the TD containing this element expand for a instance after finish
               Effect.Squish = function(element) {
-            -   return new Effect.Scale(element, window.opera ? 1 : 0, {
+            +   return new Effect.Scale(element, window.opera ? 1 : 0, {
                   restoreAfterFinish: true,
                   beforeSetup: function(effect) {
-            -       effect.element.makeClipping();
+            +       effect.element.makeClipping();
-            -     },
+            +     },
                   afterFinishInternal: function(effect) {
-            -       effect.element.hide().undoClipping();
+            +       effect.element.hide().undoClipping();
                   }
                 });
               };
                   width: element.style.width,
                   opacity: element.getInlineOpacity() };
-            -   var dims = element.getDimensions();
+            +   var dims = element.getDimensions();
                 var initialMoveX, initialMoveY;
                 var moveX, moveY;
+            +
                 switch (options.direction) {
                   case 'top-left':
-            -       initialMoveX = initialMoveY = moveX = moveY = 0;
+            +       initialMoveX = initialMoveY = moveX = moveY = 0;
                     break;
                   case 'top-right':
                     initialMoveX = dims.width;
                     moveY = -dims.height / 2;
                     break;
                 }
+            +
                 return new Effect.Move(element, {
                   x: initialMoveX,
                   y: initialMoveY,
-            -     duration: 0.01,
+            +     duration: 0.01,
                   beforeSetup: function(effect) {
                     effect.element.hide().makeClipping().makePositioned();
                   },
                       [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
                         new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
                         new Effect.Scale(effect.element, 100, {
-            -             scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
+            +             scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
                           sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
                       ], Object.extend({
                            beforeSetup: function(effect) {
-            -                effect.effects[0].element.setStyle({height: '0px'}).show();
+            +                effect.effects[0].element.setStyle({height: '0px'}).show();
                            },
                            afterFinishInternal: function(effect) {
-            -                effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
+            +                effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
                            }
                          }, options)
-            -       )
+            +       );
                   }
                 });
               };
                 var dims = element.getDimensions();
                 var moveX, moveY;
+            +
                 switch (options.direction) {
                   case 'top-left':
                     moveX = moveY = 0;
                     moveX = dims.width;
                     moveY = dims.height;
                     break;
-            -     case 'center':
+            +     case 'center':
                     moveX = dims.width / 2;
                     moveY = dims.height / 2;
                     break;
                 }
+            +
                 return new Effect.Parallel(
                   [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
                     new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
                     new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
-            -     ], Object.extend({
+            +     ], Object.extend({
                        beforeStartInternal: function(effect) {
-            -            effect.effects[0].element.makePositioned().makeClipping();
+            +            effect.effects[0].element.makePositioned().makeClipping();
                        },
                        afterFinishInternal: function(effect) {
                          effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
               Effect.Pulsate = function(element) {
                 element = $(element);
-            -   var options    = arguments[1] || { };
+            +   var options    = arguments[1] || { },
-            -   var oldOpacity = element.getInlineOpacity();
+            +     oldOpacity = element.getInlineOpacity(),
-            -   var transition = options.transition || Effect.Transitions.sinoidal;
+            +     transition = options.transition || Effect.Transitions.linear,
-            -   var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
+            +     reverser   = function(pos){
-            -   reverser.bind(transition);
+            +       return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
-            -   return new Effect.Opacity(element,
+            +     };
+            +
+            +   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}));
                   width: element.style.width,
                   height: element.style.height };
                 element.makeClipping();
-            -   return new Effect.Scale(element, 5, Object.extend({
+            +   return new Effect.Scale(element, 5, Object.extend({
                   scaleContent: false,
                   scaleX: false,
                   afterFinishInternal: function(effect) {
-            -     new Effect.Scale(element, 1, {
+            +     new Effect.Scale(element, 1, {
-            -       scaleContent: false,
+            +       scaleContent: false,
                     scaleY: false,
                     afterFinishInternal: function(effect) {
                       effect.element.hide().undoClipping().setStyle(oldStyle);
                   var options = Object.extend({
                     style: { }
                   }, arguments[1] || { });
+            +
                   if (!Object.isString(options.style)) this.style = $H(options.style);
                   else {
                     if (options.style.include(':'))
                         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 originalValue = this.element.getStyle(property);
-            -       return {
+            +       return {
-            -         style: property.camelize(),
+            +         style: property.camelize(),
-            -         originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
+            +         originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
                       targetValue: unit=='color' ? parseColor(value) : value,
                       unit: unit
                     };
                         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] =
+            +       style[(transform = this.transforms[i]).style] =
                       transform.unit=='color' ? '#'+
                         (Math.round(transform.originalValue[0]+
                           (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
                         (Math.round(transform.originalValue[2]+
                           (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
                       (transform.originalValue +
-            -           (transform.targetValue - transform.originalValue) * position).toFixed(3) +
+            +           (transform.targetValue - transform.originalValue) * position).toFixed(3) +
                           (transform.unit === null ? '' : transform.unit);
                   this.element.setStyle(style, true);
                 }
               });
               Element.CSS_PROPERTIES = $w(
-            -   'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
+            +   'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
                 'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
                 'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
                 'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
                 'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
                 'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
                 'right textIndent top width wordSpacing zIndex');
+            +
               Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
               String.__parseStyleElement = document.createElement('div');
                   String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
                   style = String.__parseStyleElement.childNodes[0].style;
                 }
+            +
                 Element.CSS_PROPERTIES.each(function(property){
-            -     if (style[property]) styleRules.set(property, style[property]);
+            +     if (style[property]) styleRules.set(property, style[property]);
                 });
+            +
                 if (Prototype.Browser.IE && this.include('opacity'))
                   styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
                 Element.getStyles = function(element) {
                   element = $(element);
                   var css = element.currentStyle, styles;
-            -     styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
+            +     styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
-            -       hash.set(property, css[property]);
+            +       results[property] = css[property];
-            -       return hash;
+            +       return results;
                   });
-            -     if (!styles.opacity) styles.set('opacity', element.getOpacity());
+            +     if (!styles.opacity) styles.opacity = element.getOpacity();
                   return styles;
                 };
-            - };
+            + }
               Effect.Methods = {
                 morph: function(element, style) {
                   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;
               $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
                 'pulsate shake puff squish switchOff dropOut').each(
-            -   function(effect) {
+            +   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(
+            + $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 ¶ +366 -271

-            - /*  Prototype JavaScript framework, version 1.6.0.1
+            + /*  Prototype JavaScript framework, version 1.6.0.3
-            -  *  (c) 2005-2007 Sam Stephenson
+            +  *  (c) 2005-2008 Sam Stephenson
                *
                *  Prototype is freely distributable under the terms of an MIT-style license.
                *  For details, see the Prototype web site: http://www.prototypejs.org/
                *--------------------------------------------------------------------------*/
               var Prototype = {
-            -   Version: '1.6.0.1',
+            +   Version: '1.6.0.3',
                 Browser: {
-            -     IE:     !!(window.attachEvent && !window.opera),
+            +     IE:     !!(window.attachEvent &&
-            -     Opera:  !!window.opera,
+            +       navigator.userAgent.indexOf('Opera') === -1),
+            +     Opera:  navigator.userAgent.indexOf('Opera') > -1,
                   WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-            -     Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1,
+            +     Gecko:  navigator.userAgent.indexOf('Gecko') > -1 &&
+            +       navigator.userAgent.indexOf('KHTML') === -1,
                   MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
                 },
                 BrowserFeatures: {
                   XPath: !!document.evaluate,
+            +     SelectorsAPI: !!document.querySelector,
                   ElementExtensions: !!window.HTMLElement,
                   SpecificElementExtensions:
-            -       document.createElement('div').__proto__ &&
+            +       document.createElement('div')['__proto__'] &&
-            -       document.createElement('div').__proto__ !==
+            +       document.createElement('div')['__proto__'] !==
-            -         document.createElement('form').__proto__
+            +         document.createElement('form')['__proto__']
                 },
                 ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
                     var property = properties[i], value = source[property];
                     if (ancestor && Object.isFunction(value) &&
                         value.argumentNames().first() == "$super") {
-            -         var method = value, value = Object.extend((function(m) {
+            +         var method = value;
+            +         value = (function(m) {
                         return function() { return ancestor[m].apply(this, arguments) };
-            -         })(property).wrap(method), {
+            +         })(property).wrap(method);
-            -           valueOf:  function() { return method },
-            -           toString: function() { return method.toString() }
+            +         value.valueOf = method.valueOf.bind(method);
-            -         });
+            +         value.toString = method.toString.bind(method);
                     }
                     this.prototype[property] = value;
                   }
                   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;
                 },
                 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) {
               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;
                 },
                   }, timeout);
                 },
+            +   defer: function() {
+            +     var args = [0.01].concat($A(arguments));
+            +     return this.delay.apply(this, args);
+            +   },
+            +
                 wrap: function(wrapper) {
                   var __method = this;
                   return function() {
                 }
               });
-            - Function.prototype.defer = Function.prototype.delay.curry(0.01);
               Date.prototype.toJSON = function() {
                 return '"' + this.getUTCFullYear() + '-' +
                   (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
                   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,'>');
                 }
               });
                 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) {
                     }
                     return before + String.interpret(ctx);
-            -     }.bind(this));
+            +     });
                 }
               });
               Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
               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;
                 },
                 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;
                     }
                 },
                 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))
                   this.each(function(value, index) {
                     if (filter.match(value))
-            -         results.push(iterator(value, index));
+            +         results.push(iterator.call(context, value, index));
                   });
                   return results;
                 },
                 },
                 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;
                 },
                 },
                 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;
                   });
                 },
                 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;
                   });
                 },
                 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];
                 },
                 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;
               function $A(iterable) {
                 if (!iterable) return [];
                 if (iterable.toArray) return iterable.toArray();
-            -   var length = iterable.length, results = new Array(length);
+            +   var length = iterable.length || 0, results = new Array(length);
                 while (length--) results[length] = iterable[length];
                 return results;
               }
               if (Prototype.Browser.WebKit) {
-            -   function $A(iterable) {
+            +   $A = function(iterable) {
                   if (!iterable) return [];
-            -     if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
+            +     // In Safari, only use the `toArray` method if it's not a NodeList.
-            -         iterable.toArray) return iterable.toArray();
+            +     // A NodeList is a function, has an function `item` property, and a numeric
-            -     var length = iterable.length, results = new Array(length);
+            +     // `length` property. Adapted from Google Doctype.
+            +     if (!(typeof iterable === 'function' && typeof iterable.length ===
+            +         'number' && typeof iterable.item === 'function') && iterable.toArray)
+            +       return iterable.toArray();
+            +     var length = iterable.length || 0, results = new Array(length);
                   while (length--) results[length] = iterable[length];
                   return results;
-            -   }
+            +   };
               }
               Array.from = $A;
                   return this + 1;
                 },
-            -   times: function(iterator) {
+            +   times: function(iterator, context) {
-            -     $R(0, this, true).each(iterator);
+            +     $R(0, this, true).each(iterator, context);
                   return this;
                 },
                   },
                   get: function(key) {
-            -       return this._object[key];
+            +       // simulating poorly supported hasOwnProperty
+            +       if (this._object[key] !== Object.prototype[key])
+            +         return this._object[key];
                   },
                   unset: function(key) {
                   },
                   toQueryString: function() {
-            -       return this.map(function(pair) {
+            +       return this.inject([], function(results, pair) {
                       var key = encodeURIComponent(pair.key), values = pair.value;
                       if (values && typeof values == 'object') {
                         if (Object.isArray(values))
-            -             return values.map(toQueryPair.curry(key)).join('&');
+            +             return results.concat(values.map(toQueryPair.curry(key)));
-            -         }
+            +         } else results.push(toQueryPair(key, values));
-            -         return toQueryPair(key, values);
+            +         return results;
                     }).join('&');
                   },
                     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();
                   }
                   }
                 },
+            +   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 }
                 },
                   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);
                   }
                       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(cache[tagName].cloneNode(false), attributes);
                 };
                 Object.extend(this.Element, element || { });
+            +   if (element) this.Element.prototype = element.prototype;
               }).call(window);
               Element.cache = { };
                 },
                 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;
                 },
                       Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
                         insertions = {bottom:insertions};
-            -     var content, t, range;
+            +     var content, insert, tagName, childNodes;
+            +
-            -     for (position in insertions) {
+            +     for (var position in insertions) {
                     content  = insertions[position];
                     position = position.toLowerCase();
-            -       t = Element._insertionTranslations[position];
+            +       insert = Element._insertionTranslations[position];
                     if (content && content.toElement) content = content.toElement();
                     if (Object.isElement(content)) {
-            -         t.insert(element, content);
+            +         insert(element, content);
                       continue;
                     }
                     content = Object.toHTML(content);
-            -       range = element.ownerDocument.createRange();
+            +       tagName = ((position == 'before' || position == 'after')
-            -       t.initializeRange(element, range);
+            +         ? element.parentNode : element).tagName.toUpperCase();
-            -       t.insert(element, range.createContextualFragment(content.stripScripts()));
+            +       childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+            +
+            +       if (position == 'top' || position == 'after') childNodes.reverse();
+            +       childNodes.each(insert.curry(element));
                     content.evalScripts.bind(content).defer();
                   }
                 },
                 descendants: function(element) {
-            -     return $(element).getElementsBySelector("*");
+            +     return $(element).select("*");
                 },
                 firstDescendant: function(element) {
                   element = $(element);
                   if (arguments.length == 1) return $(element.parentNode);
                   var ancestors = element.ancestors();
-            -     return expression ? Selector.findElement(ancestors, expression, index) :
+            +     return Object.isNumber(expression) ? ancestors[expression] :
-            -       ancestors[index || 0];
+            +       Selector.findElement(ancestors, expression, index);
                 },
                 down: function(element, expression, index) {
                   element = $(element);
                   if (arguments.length == 1) return element.firstDescendant();
-            -     var descendants = element.descendants();
+            +     return Object.isNumber(expression) ? element.descendants()[expression] :
-            -     return expression ? Selector.findElement(descendants, expression, index) :
+            +       Element.select(element, expression)[index || 0];
-            -       descendants[index || 0];
                 },
                 previous: function(element, expression, index) {
                   element = $(element);
                   if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
                   var previousSiblings = element.previousSiblings();
-            -     return expression ? Selector.findElement(previousSiblings, expression, index) :
+            +     return Object.isNumber(expression) ? previousSiblings[expression] :
-            -       previousSiblings[index || 0];
+            +       Selector.findElement(previousSiblings, expression, index);
                 },
                 next: function(element, expression, index) {
                   element = $(element);
                   if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
                   var nextSiblings = element.nextSiblings();
-            -     return expression ? Selector.findElement(nextSiblings, expression, index) :
+            +     return Object.isNumber(expression) ? nextSiblings[expression] :
-            -       nextSiblings[index || 0];
+            +       Selector.findElement(nextSiblings, expression, index);
                 },
                 select: function() {
                 descendantOf: function(element, ancestor) {
                   element = $(element), ancestor = $(ancestor);
-            -     var originalAncestor = ancestor;
                   if (element.compareDocumentPosition)
                     return (element.compareDocumentPosition(ancestor) & 8) === 8;
-            -     if (element.sourceIndex && !Prototype.Browser.Opera) {
+            +     if (ancestor.contains)
-            -       var e = element.sourceIndex, a = ancestor.sourceIndex,
+            +       return ancestor.contains(element) && ancestor !== element;
-            -        nextAncestor = ancestor.nextSibling;
-            -       if (!nextAncestor) {
-            -         do { ancestor = ancestor.parentNode; }
-            -         while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-            -       }
-            -       if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
-            -     }
                   while (element = element.parentNode)
-            -       if (element == originalAncestor) return true;
+            +       if (element == ancestor) return true;
+            +
                   return false;
                 },
                   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;
                   }
                 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};
                     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;
                     }
                     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();
                 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';
                   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;
                     }
                 }
               };
-            - 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) {
               }
               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 });
                   );
                 });
+            +   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();
                 };
                 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;
                 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;
                 });
                     (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(' ');
                 };
               }
-            - if (document.createElement('div').outerHTML) {
+            + if ('outerHTML' in document.createElement('div')) {
                 Element.Methods.replace = function(element, content) {
                   element = $(element);
               Element._getContentFromAnonymousElement = function(tagName, html) {
                 var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
-            -   div.innerHTML = t[0] + html + t[1];
+            +   if (t) {
-            -   t[2].times(function() { div = div.firstChild });
+            +     div.innerHTML = t[0] + html + t[1];
+            +     t[2].times(function() { div = div.firstChild });
+            +   } else div.innerHTML = html;
                 return $A(div.childNodes);
               };
               Element._insertionTranslations = {
-            -   before: {
+            +   before: function(element, node) {
-            -     adjacency: 'beforeBegin',
+            +     element.parentNode.insertBefore(node, element);
-            -     insert: function(element, node) {
+            +   },
-            -       element.parentNode.insertBefore(node, element);
+            +   top: function(element, node) {
-            -     },
+            +     element.insertBefore(node, element.firstChild);
-            -     initializeRange: function(element, range) {
+            +   },
-            -       range.setStartBefore(element);
+            +   bottom: function(element, node) {
-            -     }
+            +     element.appendChild(node);
-            -   },
+            +   },
-            -   top: {
+            +   after: function(element, node) {
-            -     adjacency: 'afterBegin',
+            +     element.parentNode.insertBefore(node, element.nextSibling);
-            -     insert: 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) {
-            -       element.appendChild(node);
-            -     }
-            -   },
-            -   after: {
-            -     adjacency: 'afterEnd',
-            -     insert: function(element, node) {
-            -       element.parentNode.insertBefore(node, element.nextSibling);
-            -     },
-            -     initializeRange: function(element, range) {
-            -       range.setStartAfter(element);
-            -     }
                 },
                 tags: {
                   TABLE:  ['<table>',                '</table>',                   1],
               };
               (function() {
-            -   this.bottom.initializeRange = this.top.initializeRange;
                 Object.extend(this.tags, {
                   THEAD: this.tags.TBODY,
                   TFOOT: this.tags.TBODY,
                 hasAttribute: function(element, attribute) {
                   attribute = Element._attributeTranslations.has[attribute] || attribute;
                   var node = $(element).getAttributeNode(attribute);
-            -     return node && node.specified;
+            +     return !!(node && node.specified);
                 }
               };
               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.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]);
                   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];
                 }
               document.viewport = {
                 getDimensions: function() {
-            -     var dimensions = { };
+            +     var dimensions = { }, B = Prototype.Browser;
-            -     var B = Prototype.Browser;
                   $w('width height').each(function(d) {
                     var D = d.capitalize();
-            -       dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] :
+            +       if (B.WebKit && !document.evaluate) {
-            -         (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D];
+            +         // Safari <3.0 needs self.innerWidth/Height
+            +         dimensions[d] = self['inner' + D];
+            +       } else if (B.Opera && parseFloat(window.opera.version()) < 9.5) {
+            +         // Opera <9.5 needs document.body.clientWidth/Height
+            +         dimensions[d] = document.body['client' + D]
+            +       } else {
+            +         dimensions[d] = document.documentElement['client' + D];
+            +       }
                   });
                   return dimensions;
                 },
                     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();
-            -     this.compileMatcher();
+            +     if (this.shouldUseSelectorsAPI()) {
+            +       this.mode = 'selectorsAPI';
+            +     } else if (this.shouldUseXPath()) {
+            +       this.mode = 'xpath';
+            +       this.compileXPathMatcher();
+            +     } else {
+            +       this.mode = "normal";
+            +       this.compileMatcher();
+            +     }
+            +
                 },
                 shouldUseXPath: function() {
                   // 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;
                       p = ps[i];
                       if (m = e.match(p)) {
                         this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
-            -     	      new Template(c[i]).evaluate(m));
+            +             new Template(c[i]).evaluate(m));
                         e = e.replace(m[0], '');
                         break;
                       }
                 findElements: function(root) {
                   root = root || document;
-            -     if (this.xpath) return document._getElementsByXPath(this.xpath, root);
+            +     var e = this.expression, results;
-            -     return this.matcher(root);
+            +     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) {
                     'first-child': '[not(preceding-sibling::*)]',
                     'last-child':  '[not(following-sibling::*)]',
                     'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
-            -       'empty':       "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
+            +       'empty':       "[count(*) = 0 and (count(text()) = 0)]",
                     'checked':     "[@checked]",
-            -       'disabled':    "[@disabled]",
+            +       'disabled':    "[(@disabled) and (@type!='hidden')]",
-            -       'enabled':     "[not(@disabled)]",
+            +       'enabled':     "[not(@disabled) and (@type!='hidden')]",
                     'not': function(m) {
                       var e = m[6], p = Selector.patterns,
                           x = Selector.xpath, le, v;
                 },
                 criteria: {
-            -     tagName:      'n = h.tagName(n, r, "#{1}", c);   c = false;',
+            +     tagName:      'n = h.tagName(n, r, "#{1}", c);      c = false;',
-            -     className:    'n = h.className(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;',
+            +     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, '\\"');
                   tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
                   id:           /^#([\w\-\*]+)(\b|$)/,
                   className:    /^\.([\w\-\*]+)(\b|$)/,
-            -     pseudo:       /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s)|(?=:))/,
+            +     pseudo:
-            -     attrPresence: /^\[([\w]+)\]/,
+            + /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/,
+            +     attrPresence: /^\[((?:[\w]+:)?[\w]+)\]/,
                   attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
                 },
                   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]);
                   }
                 },
                   // 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;
                   },
                   // "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++;
                     }
                   },
                     if (nodes.length == 0) return nodes;
                     var results = [], n;
                     for (var i = 0, l = nodes.length; i < l; i++)
-            -         if (!(n = nodes[i])._counted) {
+            +         if (!(n = nodes[i])._countedByPrototype) {
-            -           n._counted = true;
+            +           n._countedByPrototype = Prototype.emptyFunction;
                         results.push(Element.extend(n));
                       }
                     return Selector.handlers.unmark(results);
                   nextElementSibling: function(node) {
                     while (node = node.nextSibling)
-            - 	      if (node.nodeType == 1) return node;
+            +         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) {
                         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);
                   },
                     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);
                     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);
                       }
                   '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;
                     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;
                   },
                 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;
                 },
                 },
                 findChildElements: function(element, expressions) {
-            -     var exprs = expressions.join(',');
+            +     expressions = Selector.split(expressions.join(','));
-            -     expressions = [];
-            -     exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-            -       expressions.push(m[1].strip());
-            -     });
                   var results = [], h = Selector.handlers;
                   for (var i = 0, l = expressions.length, selector; i < l; i++) {
                     selector = new Selector(expressions[i].strip());
               });
               if (Prototype.Browser.IE) {
-            -   // IE returns comment nodes on getElementsByTagName("*").
+            +   Object.extend(Selector.handlers, {
-            -   // Filter them out.
+            +     // IE returns comment nodes on getElementsByTagName("*").
-            -   Selector.handlers.concat = function(a, b) {
+            +     // Filter them out.
-            -     for (var i = 0, node; node = b[i]; i++)
+            +     concat: function(a, b) {
-            -       if (node.tagName !== "!") a.push(node);
+            +       for (var i = 0, node; node = b[i]; i++)
-            -     return a;
+            +         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 $$() {
                   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
                 disable: function(element) {
                   element = $(element);
-            -     element.blur();
                   element.disabled = true;
                   return element;
                 },
                   else element.value = value;
                 },
-            -   select: function(element, index) {
+            +   select: function(element, value) {
-            -     if (Object.isUndefined(index))
+            +     if (Object.isUndefined(value))
                     return this[element.type == 'select-one' ?
                       'selectOne' : 'selectMany'](element);
                   else {
-            -       var opt, value, single = !Object.isArray(index);
+            +       var opt, currentValue, single = !Object.isArray(value);
                     for (var i = 0, length = element.length; i < length; i++) {
                       opt = element.options[i];
-            -         value = this.optionValue(opt);
+            +         currentValue = this.optionValue(opt);
                       if (single) {
-            -           if (value == index) {
+            +           if (currentValue == value) {
                           opt.selected = true;
                           return;
                         }
                       }
-            -         else opt.selected = index.include(value);
+            +         else opt.selected = value.include(currentValue);
                     }
                   }
                 },
                   isRightClick:  function(event) { return isButton(event, 2) },
                   element: function(event) {
-            -       var node = Event.extend(event).target;
+            +       event = Event.extend(event);
-            -       return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
+            +       var node          = event.target,
+            +           type          = event.type,
+            +           currentTarget = event.currentTarget;
+            +
+            +       if (currentTarget && currentTarget.tagName) {
+            +         // Firefox screws up the "click" event when moving between radio buttons
+            +         // via arrow keys. It also screws up the "load" and "error" events on images,
+            +         // reporting the document as the target instead of the original image.
+            +         if (type === 'load' || type === 'error' ||
+            +           (type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
+            +             && currentTarget.type === 'radio'))
+            +               node = currentTarget;
+            +       }
+            +       if (node.nodeType == Node.TEXT_NODE) node = node.parentNode;
+            +       return Element.extend(node);
                   },
                   findElement: function(event, expression) {
                   },
                   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))
                     };
                   },
                   };
                 } 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;
                 }
                 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) {
                         return false;
                     Event.extend(event);
-            -       handler.call(element, event)
+            +       handler.call(element, event);
                   };
                   wrapper.handler = handler;
                       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);
                     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";
                     }
               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) {

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: 779 inserted, 674 deleted

Sign in to your account

Commit r163:74e3afe899a3 public

Author

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

Commit `r163:74e3afe899a3` public