Changeset 7855

Timestamp:

03/13/08 10:12:37 (1 year ago)

Author:

FabianLange

Message:

Updated to Prototype 1.6.0.2, Scriptaculous 1.8.1 (fixes #2072)

- Added submit_image_to_remote method (fixes #2322)
- Improved Javascript type handling for Booleans and some strigns (fixes #2224)
- Allow pass through of InPlaceEditor? options (fixes #1276, #2176, #1753, #1540)
- Kept symfony option names for backwards compatibility
- removed "default options" in input_in_place_editor_tag, as they were not used in sf 1.0
- removed "tokens" option in InPlaceEditor? as it was only a c&p error from autocompleter. There is no such option.
- Updated documentation for InPlaceEditor?
- Replaced deprecated Insertion code in update_element_function

for the new InPlaceEditor? API visit: http://mir.aculo.us/2007/7/17/in-place-editing-the-summer-2007-rewrite/

Files:

• branches/1.1/data/web/sf/prototype/js/builder.js (modified) (5 diffs)
• branches/1.1/data/web/sf/prototype/js/controls.js (modified) (19 diffs)
• branches/1.1/data/web/sf/prototype/js/dragdrop.js (modified) (29 diffs)
• branches/1.1/data/web/sf/prototype/js/effects.js (modified) (50 diffs)
• branches/1.1/data/web/sf/prototype/js/prototype.js (modified) (84 diffs)
• branches/1.1/data/web/sf/prototype/js/scriptaculous.js (modified) (3 diffs)
• branches/1.1/data/web/sf/prototype/js/slider.js (modified) (18 diffs)
• branches/1.1/data/web/sf/prototype/js/sound.js (added)
• branches/1.1/data/web/sf/prototype/js/unittest.js (modified) (2 diffs)
• branches/1.1/lib/helper/JavascriptHelper.php (modified) (15 diffs)
• branches/1.1/licenses/LICENSE.prototype (modified) (2 diffs)
• branches/1.1/licenses/LICENSE.script.aculo.us (modified) (1 diff)
• doc/branches/1.1/book/11-Ajax-Integration.txt (modified) (1 diff)

branches/1.1/data/web/sf/prototype/js/builder.js

@@ -1 @@
-7.0, Fri Jan 19 19:16:36 CET 2007
+8.1, Thu Jan 03 22:07:12 -0500 2008
-
-, 2006
+-2007
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
@@ -49 +49 @@
-    if(arguments[1])
-      if(this._isStringOrNumber(arguments[1]) ||
-
+
+
-          this._children(element, arguments[1]);
-        } else {
@@ -67 +68 @@
-            if(element.tagName.toUpperCase() != elementName)
-              element = parentElement.getElementsByTagName(elementName)[0];
-  
+
-        } 
-
@@ -89 +90 @@
-    for(attribute in attributes)
-      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-
+.gsub(/"/,'"')
-    return attrs.join(" ");
-  },
-  _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
-    if(typeof children=='object') { // array can hold nodes and text
-      children.flatten().each( function(e) {
@@ -102 +107 @@
-      });
-    } else
- 
- 
+
+
-  },
-  _isStringOrNumber: function(param) {

branches/1.1/data/web/sf/prototype/js/controls.js

@@ -1 @@
-7.0, Fri Jan 19 19:16:36 CET 2007
-
-, 2006
-, 2006
-, 2006
+8.1, Thu Jan 03 22:07:12 -0500 2008
+
+-2007
+-2007
+-2007
-// Contributors:
-//  Richard Livsey
@@ -40 +40 @@
-  throw("controls.js requires including script.aculo.us' effects.js library");
-
-
-
-
+
+
-  baseInitialize: function(element, update, options) {
-
+
+
-    this.update      = $(update);  
-    this.hasFocus    = false; 
@@ -51 +51 @@
-    this.index       = 0;     
-    this.entryCount  = 0;
+    this.oldElementValue = this.element.value;
-
-    if(this.setOptions)
-      this.setOptions(options);
-    else
-
+ 
-
-    this.options.paramName    = this.options.paramName || this.element.name;
@@ -77 +78 @@
-    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;
@@ -84 +88 @@
-    Element.hide(this.update);
-
-"blur"
-"keypress"
+'blur'
+'keydown'
-  },
-
@@ -91 +95 @@
-    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix && 
-
-
+
-      (Element.getStyle(this.update, 'position')=='absolute')) {
-      new Insertion.After(this.update, 
@@ -142 +145 @@
-         this.markPrevious();
-         this.render();
-if(navigator.appVersion.indexOf('AppleWebKit')>0) 
+
-         return;
-       case Event.KEY_DOWN:
-         this.markNext();
-         this.render();
-if(navigator.appVersion.indexOf('AppleWebKit')>0) 
+
-         return;
-      }
-     else 
-       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
-navigator.appVersion.indexOf('AppleWebKit')
+Prototype.Browser.WebKit
-
-    this.changed = true;
@@ -198 +201 @@
-          Element.addClassName(this.getEntry(i),"selected") : 
-          Element.removeClassName(this.getEntry(i),"selected");
-        
-      if(this.hasFocus) { 
-        this.show();
@@ -241 +243 @@
-    var value = '';
-    if (this.options.select) {
-document.getElementsByClassName(this.options.select, selectedElemen
+$(selectedElement).select('.' + this.options.selec
-      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
-    } else
-      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-    
-lastTokenPos = this.findLastToken
-lastTokenPos
-lastTokenPos + 1
-lastTokenPos + 1
+bounds = this.getTokenBounds
+bounds[0]
+bounds[0]
+bounds[0]
-      if (whitespace)
-        newValue += whitespace[0];
-
+ + this.element.value.substr(bounds[1])
-    } else {
-      this.element.value = value;
-    }
+    this.oldElementValue = this.element.value;
-    this.element.focus();
-    
@@ -299 +302 @@
-  onObserverEvent: function() {
-    this.changed = false;   
+    this.tokenBounds = null;
-    if(this.getToken().length>=this.options.minChars) {
-      this.startIndicator();
-      this.getUpdatedChoices();
-    } else {
@@ -306 +309 @@
-      this.hide();
-    }
+    this.oldElementValue = this.element.value;
-  },
-
-  getToken: function() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  initialize: function(element, update, url, options) {
-    this.baseInitialize(element, update, options);
@@ -341 +353 @@
-
-  getUpdatedChoices: function() {
-
+
+
+
-      encodeURIComponent(this.getToken());
-
@@ -349 +363 @@
-    if(this.options.defaultParams) 
-      this.options.parameters += '&' + this.options.defaultParams;
-
+
-    new Ajax.Request(this.url, this.options);
-  },
@@ -356 +370 @@
-    this.updateChoices(request.responseText);
-  }
-
-});
-
@@ -394 +407 @@
-// you support them.
-
-
-
+
-  initialize: function(element, update, array, options) {
-    this.baseInitialize(element, update, options);
@@ -451 +463 @@
-        return "<ul>" + ret.join('') + "</ul>";
-      }
-
+ 
-  }
-});
-
-
-
-
+
+
-
-// Use this if you notice weird scrolling problems on some browsers,
@@ -468 +479 @@
-}
-
-
-
-
+
-  initialize: function(element, url, options) {
-    this.url = url;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      this.options.externalControl = $(this.options.externalControl);
-
-
-
-
-
-
-
+
+
+
-    this.element.title = this.options.clickToEditText;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    this.createForm();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  },
-  getText: function() {
-    return this.element.innerHTML;
-  },
+  handleAJAXFailure: function(transport) {
+    this.triggerCallback('onFailure', transport);
+    if (this._oldInnerHTML) {
+      this.element.innerHTML = this._oldInnerHTML;
+      this._oldInnerHTML = null;
+    }
+  },
+  handleFormCancellation: function(e) {
+    this.wrapUp();
+    if (e) Event.stop(e);
+  },
+  handleFormSubmission: function(e) {
+    var form = this._form;
+    var value = $F(this._controls.editor);
+    this.prepareSubmission();
+    var params = this.options.callback(form, value) || '';
+    if (Object.isString(params))
+      params = params.toQueryParams();
+    params.editorId = this.element.id;
+    if (this.options.htmlResponse) {
+      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Updater({ success: this.element }, this.url, options);
+    } else {
+      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Request(this.url, options);
+    }
+    if (e) Event.stop(e);
+  },
+  leaveEditMode: function() {
+    this.element.removeClassName(this.options.savingClassName);
+    this.removeForm();
+    this.leaveHover();
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+    if (this.options.externalControl)
+      this.options.externalControl.show();
+    this._saving = false;
+    this._editing = false;
+    this._oldInnerHTML = null;
+    this.triggerCallback('onLeaveEditMode');
+  },
+  leaveHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.removeClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onLeaveHover');
+  },
-  loadExternalText: function() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    this.removeForm();
-    this.leaveHover();
-    this.showSaving();
-  },
+  registerListeners: function() {
+    this._listeners = { };
+    var listener;
+    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
+      listener = this[pair.value].bind(this);
+      this._listeners[pair.key] = listener;
+      if (!this.options.externalControlOnly)
+        this.element.observe(pair.key, listener);
+      if (this.options.externalControl)
+        this.options.externalControl.observe(pair.key, listener);
+    }.bind(this));
+  },
+  removeForm: function() {
+    if (!this._form) return;
+    this._form.remove();
+    this._form = null;
+    this._controls = { };
+  },
-  showSaving: function() {
-
+_
-    this.element.innerHTML = this.options.savingText;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    this.leaveEditMode();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  }
-});
+
+Object.extend(Ajax.InPlaceEditor.prototype, {
+  dispose: Ajax.InPlaceEditor.prototype.destroy
+});
+
+Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
+  initialize: function($super, element, url, options) {
+    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
+    $super(element, url, options);
+  },
+
+  createEditField: function() {
+    var list = document.createElement('select');
+    list.name = this.options.paramName;
+    list.size = 1;
+    this._controls.editor = list;
+    this._collection = this.options.collection || [];
+    if (this.options.loadCollectionURL)
+      this.loadCollection();
+    else
+      this.checkForExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+
+  loadCollection: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this.showLoadingText(this.options.loadingCollectionText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        var js = transport.responseText.strip();
+        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
+          throw 'Server returned an invalid collection representation.';
+        this._collection = eval(js);
+        this.checkForExternalText();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadCollectionURL, options);
+  },
+
+  showLoadingText: function(text) {
+    this._controls.editor.disabled = true;
+    var tempOption = this._controls.editor.firstChild;
+    if (!tempOption) {
+      tempOption = document.createElement('option');
+      tempOption.value = '';
+      this._controls.editor.appendChild(tempOption);
+      tempOption.selected = true;
+    }
+    tempOption.update((text || '').stripScripts().stripTags());
+  },
+
+  checkForExternalText: function() {
+    this._text = this.getText();
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    else
+      this.buildOptionList();
+  },
+
+  loadExternalText: function() {
+    this.showLoadingText(this.options.loadingText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._text = transport.responseText.strip();
+        this.buildOptionList();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+
+  buildOptionList: function() {
+    this._form.removeClassName(this.options.loadingClassName);
+    this._collection = this._collection.map(function(entry) {
+      return 2 === entry.length ? entry : [entry, entry].flatten();
+    });
+    var marker = ('value' in this.options) ? this.options.value : this._text;
+    var textFound = this._collection.any(function(entry) {
+      return entry[0] == marker;
+    }.bind(this));
+    this._controls.editor.update('');
+    var option;
+    this._collection.each(function(entry, index) {
+      option = document.createElement('option');
+      option.value = entry[0];
+      option.selected = textFound ? entry[0] == marker : 0 == index;
+      option.appendChild(document.createTextNode(entry[1]));
+      this._controls.editor.appendChild(option);
+    }.bind(this));
+    this._controls.editor.disabled = false;
+    Field.scrollFreeActivate(this._controls.editor);
+  }
+});
+
+//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
+//**** This only  exists for a while,  in order to  let ****
+//**** users adapt to  the new API.  Read up on the new ****
+//**** API and convert your code to it ASAP!            ****
+
+Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
+  if (!options) return;
+  function fallback(name, expr) {
+    if (name in options || expr === undefined) return;
+    options[name] = expr;
+  };
+  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
+    options.cancelLink == options.cancelButton == false ? false : undefined)));
+  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
+    options.okLink == options.okButton == false ? false : undefined)));
+  fallback('highlightColor', options.highlightcolor);
+  fallback('highlightEndColor', options.highlightendcolor);
+};
+
+Object.extend(Ajax.InPlaceEditor, {
+  DefaultOptions: {
+    ajaxOptions: { },
+    autoRows: 3,                                // Use when multi-line w/ rows == 1
+    cancelControl: 'link',                      // 'link'|'button'|false
+    cancelText: 'cancel',
+    clickToEditText: 'Click to edit',
+    externalControl: null,                      // id|elt
+    externalControlOnly: false,
+    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
+    formClassName: 'inplaceeditor-form',
+    formId: null,                               // id|elt
+    highlightColor: '#ffff99',
+    highlightEndColor: '#ffffff',
+    hoverClassName: '',
+    htmlResponse: true,
+    loadingClassName: 'inplaceeditor-loading',
+    loadingText: 'Loading...',
+    okControl: 'button',                        // 'link'|'button'|false
+    okText: 'ok',
+    paramName: 'value',
+    rows: 1,                                    // If 1 and multi-line, uses autoRows
+    savingClassName: 'inplaceeditor-saving',
+    savingText: 'Saving...',
+    size: 0,
+    stripLoadedTextTags: false,
+    submitOnBlur: false,
+    textAfterControls: '',
+    textBeforeControls: '',
+    textBetweenControls: ''
+  },
+  DefaultCallbacks: {
+    callback: function(form) {
+      return Form.serialize(form);
+    },
+    onComplete: function(transport, element) {
+      // For backward compatibility, this one is bound to the IPE, and passes
+      // the element directly.  It was too often customized, so we don't break it.
+      new Effect.Highlight(element, {
+        startcolor: this.options.highlightColor, keepBackgroundImage: true });
+    },
+    onEnterEditMode: null,
+    onEnterHover: function(ipe) {
+      ipe.element.style.backgroundColor = ipe.options.highlightColor;
+      if (ipe._effect)
+        ipe._effect.cancel();
+    },
+    onFailure: function(transport, ipe) {
+      alert('Error communication with the server: ' + transport.responseText.stripTags());
+    },
+    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
+    onLeaveEditMode: null,
+    onLeaveHover: function(ipe) {
+      ipe._effect = new Effect.Highlight(ipe.element, {
+        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
+        restorecolor: ipe._originalBackground, keepBackgroundImage: true
+      });
+    }
+  },
+  Listeners: {
+    click: 'enterEditMode',
+    keydown: 'checkForEscapeOrReturn',
+    mouseover: 'enterHover',
+    mouseout: 'leaveHover'
+  }
+});
+
+Ajax.InPlaceCollectionEditor.DefaultOptions = {
+  loadingCollectionText: 'Loading options...'
+};
-
-// Delayed observer, like Form.Element.Observer, 
@@ -813 +944 @@
-// Ideal for live-search fields
-
-
-
+
-  initialize: function(element, delay, callback) {
-    this.delay     = delay || 0.5;
@@ -833 +963 @@
-    this.callback(this.element, $F(this.element));
-  }
-
+)

branches/1.1/data/web/sf/prototype/js/dragdrop.js

@@ -1 @@
-7.0, Fri Jan 19 19:16:36 CET 2007
-
-, 2006
-, 2006
+8.1, Thu Jan 03 22:07:12 -0500 2008
+
+-2007
+-2007
-// 
-// 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/
-
-typeof Effect == 'undefined'
+Object.isUndefined(Effect)
-  throw("dragdrop.js requires including script.aculo.us' effects.js library");
-
@@ -23 +23 @@
-      hoverclass: null,
-      tree:       false
-
+ 
-
-    // cache containers
@@ -29 +29 @@
-      options._containers = [];
-      var containment = options.containment;
-
-
+
-        containment.each( function(c) { options._containers.push($(c)) });
-      } else {
@@ -90 +89 @@
-  show: function(point, element) {
-    if(!this.drops.length) return;
-
-
-
+
+
-    this.drops.each( function(drop) {
-      if(Droppables.isAffected(point, element, drop))
@@ -98 +96 @@
-    });
-        
- {
+
-      drop = Droppables.findDeepestChild(affected);
+
+    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
+    if (drop) {
-      Position.within(drop.element, point[0], point[1]);
-      if(drop.onHover)
-        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-      
-
+if (drop != this.last_active) 
-    }
-  },
@@ -113 +114 @@
-
-    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
-
-
+
+
+
+
-  },
-
@@ -222 +225 @@
-/*--------------------------------------------------------------------------*/
-
-
-
-
-
+
-  initialize: function(element) {
-    var defaults = {
@@ -236 +236 @@
-      },
-      endeffect: function(element) {
-typeof element._opacity == 'number'
+Object.isNumber(element._opacity)
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
-          queue: {scope:'_draggable', position:'end'},
@@ -246 +246 @@
-      zindex: 1000,
-      revert: false,
+      quiet: false,
-      scroll: false,
-      scrollSensitivity: 20,
@@ -253 +254 @@
-    };
-    
-typeof arguments[1].endeffect == 'undefined'
+Object.isUndefined(arguments[1].endeffect)
-      Object.extend(defaults, {
-        starteffect: function(element) {
@@ -262 +263 @@
-      });
-    
-
+ 
-
-    this.element = $(element);
-    
-(typeof options.handle == 'string'
+Object.isString(options.handle
-      this.handle = this.element.down('.'+options.handle, 0);
-    
@@ -279 +280 @@
-    Element.makePositioned(this.element); // fix IE    
-
-    this.delta    = this.currentDelta();
-    this.options  = options;
-    this.dragging = false;   
@@ -301 +301 @@
-  
-  initDrag: function(event) {
-typeof Draggable._dragging[this.element] != 'undefined'
+!Object.isUndefined(Draggable._dragging[this.element])
-      Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
@@ -324 +324 @@
-  startDrag: function(event) {
-    this.dragging = true;
+    if(!this.delta)
+      this.delta = this.currentDelta();
-    
-    if(this.options.zindex) {
@@ -332 +334 @@
-    if(this.options.ghosting) {
-      this._clone = this.element.cloneNode(true);
-
+
+
+
-      this.element.parentNode.insertBefore(this._clone, this.element);
-    }
@@ -354 +358 @@
-  updateDrag: function(event, pointer) {
-    if(!this.dragging) this.startDrag(event);
-
-
+
+
+
+
+
+
-    Draggables.notify('onDrag', this, event);
-    
@@ -383 +391 @@
-    
-    // fix AppleWebKit rendering
-navigator.appVersion.indexOf('AppleWebKit')>0
+Prototype.Browser.WebKit
-    
-    Event.stop(event);
@@ -390 +398 @@
-  finishDrag: function(event, success) {
-    this.dragging = false;
+    
+    if(this.options.quiet){
+      Position.prepare();
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      Droppables.show(pointer, this.element);
+    }
-
-    if(this.options.ghosting) {
-
+
+
+
-      Element.remove(this._clone);
-      this._clone = null;
-    }
-
-
+
+
+
+
+
+
-    Draggables.notify('onEnd', this, event);
-
-    var revert = this.options.revert;
-typeof revert == 'function'
+Object.isFunction(revert)
-    
-    var d = this.currentDelta();
-    if(revert && this.options.reverteffect) {
-
-
+
+
+
-    } else {
-      this.delta = d;
@@ -454 +476 @@
-    
-    if(this.options.snap) {
-typeof this.options.snap == 'function'
+Object.isFunction(this.options.snap)
-        p = this.options.snap(p[0],p[1],this);
-      } else {
-this.options.snap instanceof Array
+Object.isArray(this.options.snap)
-        p = p.map( function(v, i) {
-Math.round(v/this.options.snap[i]
+(v/this.options.snap[i]).round(
-      } else {
-        p = p.map( function(v) {
-Math.round(v/this.options.snap
+(v/this.options.snap).round(
-      }
-    }}
@@ -546 +568 @@
-    return { top: T, left: L, width: W, height: H };
-  }
-
+
+
+
-
-/*--------------------------------------------------------------------------*/
-
-
-
+
-  initialize: function(element, observer) {
-    this.element   = $(element);
@@ -567 +590 @@
-      this.observer(this.element)
-  }
-
+);
-
-var Sortable = {
-  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
-  
-
+ 
-  
-  _findRootElement: function(element) {
@@ -615 +638 @@
-      hoverclass:  null,
-      ghosting:    false,
+      quiet:       false, 
-      scroll:      false,
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-      format:      this.SERIALIZE_RULE,
+      
+      // these take arrays of elements or ids and can be 
+      // used for better initialization performance
+      elements:    false,
+      handles:     false,
+      
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
-
+ 
-
-    // clear any old sortable with same element
@@ -629 +659 @@
-    var options_for_draggable = {
-      revert:      true,
+      quiet:       options.quiet,
-      scroll:      options.scroll,
-      scrollSpeed: options.scrollSpeed,
@@ -682 +713 @@
-    }
-
-
-
-
-
+
+
+
-      options.draggables.push(
-        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
@@ -845 +875 @@
-      name: element.id,
-      format: sortableOptions.format
-
+ 
-    
-    var root = {
@@ -869 +899 @@
-  sequence: function(element) {
-    element = $(element);
-
+ 
-    
-    return $(this.findElements(element, options) || []).map( function(item) {
@@ -878 +908 @@
-  setSequence: function(element, new_sequence) {
-    element = $(element);
-
-
-
+ 
+
+ 
-    this.findElements(element, options).each( function(n) {
-        if (n.id.match(options.format))
@@ -898 +928 @@
-  serialize: function(element) {
-    element = $(element);
-
+ 
-    var name = encodeURIComponent(
-      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
@@ -922 +952 @@
-}
-
- 
+
-  if(!element.hasChildNodes()) return null;
-  tagName = tagName.toUpperCase();

branches/1.1/data/web/sf/prototype/js/effects.js

@@ -1 @@
-7.0, Fri Jan 19 19:16:36 CET 2007
-
-, 2006
+8.1, Thu Jan 03 22:07:12 -0500 2008
+
+-2007
-// Contributors:
-//  Justin Palmer (http://encytemedia.com/)
@@ -14 +14 @@
-String.prototype.parseColor = function() {  
-  var color = '#';
-
+ 
-    var cols = this.slice(4,this.length-1).split(',');  
-    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
-  } else {  
-
-
-
+ 
+ 
+ 
-    }  
-  }  
-
-
+ 
+;
-
-/*--------------------------------------------------------------------------*/
@@ -33 +33 @@
-      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
-  }).flatten().join('');
-
+;
-
-Element.collectTextNodesIgnoreClass = function(element, className) {  
@@ -41 +41 @@
-        Element.collectTextNodesIgnoreClass(node, className) : ''));
-  }).flatten().join('');
-
+;
-
-Element.setContentZoom = function(element, percent) {
-  element = $(element);  
-  element.setStyle({fontSize: (percent/100) + 'em'});   
-(navigator.appVersion.indexOf('AppleWebKit')>0
+ (Prototype.Browser.WebKit
-  return element;
-
-
-
-
-
-
-
-
-
+
-
-Element.getInlineOpacity = function(element){
-  return $(element).style.opacity || '';
-
+;
-
-Element.forceRerendering = function(element) {
@@ -73 +65 @@
-/*--------------------------------------------------------------------------*/
-
-Array.prototype.call = function() {
-  var args = arguments;
-  this.each(function(f){ f.apply(this, args) });
-}
-
-/*--------------------------------------------------------------------------*/
-
-var Effect = {
-  _elementDoesNotExistError: {
@@ -85 +70 @@
-    message: 'The specified DOM element does not exist, but is required for this effect to operate'
-  },
+  Transitions: {
+    linear: Prototype.K,
+    sinoidal: function(pos) {
+      return (-Math.cos(pos*Math.PI)/2) + 0.5;
+    },
+    reverse: function(pos) {
+      return 1-pos;
+    },
+    flicker: function(pos) {
+      var pos = ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+      return pos > 1 ? 1 : pos;
+    },
+    wobble: function(pos) {
+      return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+    },
+    pulse: function(pos, pulses) { 
+      pulses = pulses || 5; 
+      return (
+        ((pos % (1/pulses)) * pulses).round() == 0 ? 
+              ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 
+          1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
+        );
+    },
+    spring: function(pos) { 
+      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); 
+    },
+    none: function(pos) {
+      return 0;
+    },
+    full: function(pos) {
+      return 1;
+    }
+  },
+  DefaultOptions: {
+    duration:   1.0,   // seconds
+    fps:        100,   // 100= assume 66fps max.
+    sync:       false, // true for combining
+    from:       0.0,
+    to:         1.0,
+    delay:      0.0,
+    queue:      'parallel'
+  },
-  tagifyText: function(element) {
-    if(typeof Builder == 'undefined')
-      throw("Effect.tagifyText requires including script.aculo.us' builder.js library");
-      
-    var tagifyStyle = 'position:relative';
-(/MSIE/.test(navigator.userAgent) && !window.opera
+ (Prototype.Browser.IE
-    
-    element = $(element);
-    $A(element.childNodes).each( function(child) {
-
+ 
-        child.nodeValue.toArray().each( function(character) {
-          element.insertBefore(
-Builder.node('span',{style: tagifyStyle},
+new Element('span', {style: tagifyStyle}).update(
-              character == ' ' ? String.fromCharCode(160) : character), 
-              child);
@@ -107 +131 @@
-  multiple: function(element, effect) {
-    var elements;
-
-(typeof element == 'function'
+ 
+Object.isFunction(element
-       (element.length))
-      elements = element;
@@ -117 +141 @@
-      speed: 0.1,
-      delay: 0.0
-
+ 
-    var masterDelay = options.delay;
-
@@ -134 +158 @@
-    var options = Object.extend({
-      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
-
+ 
-    Effect[element.visible() ? 
-      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
@@ -140 +164 @@
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/* ------------- core effects ------------- */
-
-
-
+
-  initialize: function() {
-    this.effects  = [];
-
+    
-  },
-  _each: function(iterator) {
@@ -188 +179 @@
-    var timestamp = new Date().getTime();
-    
-(typeof effect.options.queue == 'string'
+Object.isString(effect.options.queue
-      effect.options.queue : effect.options.queue.position;
-    
@@ -211 +202 @@
-    effect.finishOn += timestamp;
-
-
+ 
-      this.effects.push(effect);
-    
-(!this.interval) 
+ (!this.interval)
-      this.interval = setInterval(this.loop.bind(this), 15);
-  },
-  remove: function(effect) {
-    this.effects = this.effects.reject(function(e) { return e==effect });
-
+ 
-      clearInterval(this.interval);
-      this.interval = null;
@@ -227 +218 @@
-    var timePos = new Date().getTime();
-    for(var i=0, len=this.effects.length;i<len;i++) 
-if(this.effects[i])
+this.effects[i] &&
-  }
-});
@@ -234 +225 @@
-  instances: $H(),
-  get: function(queueName) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-Effect.Queue = Effect.Queues.get('global');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  position: null,
-  start: function(options) {
-
+
+
+
+
+
+
+
+
-    this.currentFrame = 0;
-    this.state        = 'idle';
-    this.startOn      = this.options.delay*1000;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    this.event('beforeStart');
-
-typeof this.options.queue == 'string'
+ 
+Object.isString(this.options.queue)
-        'global' : this.options.queue.scope).add(this);
-  },
-  loop: function(timePos) {
-
-
+ 
+ 
-        this.render(1.0);
-        this.cancel();
-        this.event('beforeFinish');
-
+ 
-        this.event('afterFinish');
-        return;  
-      }
-(this.finishOn - this.startOn);
-var frame = Math.round(pos * this.options.fps * this.options.duration
-
+this.totalTime,
+    frame = (pos * this.totalFrames).round(
+ 
-        this.render(pos);
-        this.currentFrame = frame;
@@ -287 +288 @@
-    }
-  },
-  render: function(pos) {
-    if(this.state == 'idle') {
-      this.state = 'running';
-      this.event('beforeSetup');
-      if(this.setup) this.setup();
-      this.event('afterSetup');
-    }
-    if(this.state == 'running') {
-      if(this.options.transition) pos = this.options.transition(pos);
-      pos *= (this.options.to-this.options.from);
-      pos += this.options.from;
-      this.position = pos;
-      this.event('beforeUpdate');
-      if(this.update) this.update(pos);
-      this.event('afterUpdate');
-    }
-  },
-  cancel: function() {
-
-typeof this.options.queue == 'string'
+ 
+Object.isString(this.options.queue)
-        'global' : this.options.queue.scope).remove(this);
-    this.state = 'finished';
-  },
-  event: function(eventName) {
-
-
+ 
+ 
-  },
-  inspect: function() {
-    var data = $H();
-    for(property in this)
-(typeof this[property] != 'function') data[property] = this[property]
+ (!Object.isFunction(this[property])) data.set(property, this[property])
-    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
-  }
-
-
-
-
+
+
+
-  initialize: function(effects) {
-    this.effects = effects || [];
@@ -336 +319 @@
-      effect.cancel();
-      effect.event('beforeFinish');
-
+ 
-      effect.event('afterFinish');
-    });
@@ -342 +325 @@
-});
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  initialize: function() {
-
-
-
-
+
-  },
-  update: Prototype.emptyFunction
-});
-
-
-
+
-  initialize: function(element) {
-    this.element = $(element);
-
+ 
-    // make this work on IE on elements without 'layout'
-(/MSIE/.test(navigator.userAgent) && !window.opera
+ (Prototype.Browser.IE
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
-      from: this.element.getOpacity() || 0.0,
-      to:   1.0
-
+ 
-    this.start(options);
-  },
@@ -372 +365 @@
-});
-
-
-
+
-  initialize: function(element) {
-    this.element = $(element);
-
+ 
-    var options = Object.extend({
-      x:    0,
-      y:    0,
-      mode: 'relative'
-
+ 
-    this.start(options);
-  },
-  setup: function() {
-    // Bug in Opera: Opera returns the "real" position of a static element or
-    // relative element that does not have top/left explicitly set.
-    // ==> Always set top and left for position relative elements in your stylesheets 
-    // (to 0 if you do not need them) 
-    this.element.makePositioned();
-    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
-    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
-
-
+
-      this.options.x = this.options.x - this.originalLeft;
-      this.options.y = this.options.y - this.originalTop;
@@ -400 +387 @@
-  update: function(position) {
-    this.element.setStyle({
-Math.round(this.options.x  * position + this.originalLeft
-Math.round(this.options.y  * position + this.originalTop
+(this.options.x  * position + this.originalLeft).round(
+(this.options.y  * position + this.originalTop).round(
-    });
-  }
@@ -409 +396 @@
-Effect.MoveBy = function(element, toTop, toLeft) {
-  return new Effect.Move(element, 
-
-
-
-
-
+
+
+
+
-  initialize: function(element, percent) {
-    this.element = $(element);
-
+ 
-    var options = Object.extend({
-      scaleX: true,
@@ -422 +408 @@
-      scaleContent: true,
-      scaleFromCenter: false,
-
+ 
-      scaleFrom: 100.0,
-      scaleTo:   percent
-
+ 
-    this.start(options);
-  },
@@ -432 +418 @@
-    this.elementPositioning = this.element.getStyle('position');
-    
-
+ 
-    ['top','left','width','height','fontSize'].each( function(k) {
-      this.originalStyle[k] = this.element.style[k];
@@ -442 +428 @@
-    var fontSize = this.element.getStyle('font-size') || '100%';
-    ['em','px','%','pt'].each( function(fontSizeType) {
-
+ 
-        this.fontSize     = parseFloat(fontSize);
-        this.fontSizeType = fontSizeType;
@@ -451 +437 @@
-    
-    this.dims = null;
-
+ 
-      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
-
+ 
-      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
-
+ 
-      this.dims = [this.options.scaleMode.originalHeight,
-                   this.options.scaleMode.originalWidth];
@@ -461 +447 @@
-  update: function(position) {
-    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
-
+ 
-      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
-    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
-  },
-  finish: function(position) {
-
+ 
-  },
-  setDimensions: function(height, width) {
-
-(this.options.scaleX) d.width = Math.round(width
-(this.options.scaleY) d.height = Math.round(height
-
+ 
+ (this.options.scaleX) d.width = width.round(
+ (this.options.scaleY) d.height = height.round(
+ 
-      var topd  = (height - this.dims[0])/2;
-      var leftd = (width  - this.dims[1])/2;
-
-
-
+ 
+ 
+ 
-      } else {
-
-
+ 
+ 
-      }
-    }
@@ -487 +473 @@
-});
-
-
-
+
-  initialize: function(element) {
-    this.element = $(element);
-
-
+ 
+ 
-    this.start(options);
-  },
-  setup: function() {
-    // Prevent executing on elements not in the layout flow
-
+ 
-    // Disable background image during the effect
-
+ 
-    if (!this.options.keepBackgroundImage) {
-      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
-      this.element.setStyle({backgroundImage: 'none'});
-    }
-
+ 
-      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
-
+ 
-      this.options.restorecolor = this.element.getStyle('background-color');
-    // init color calculations
@@ -514 +499 @@
-  update: function(position) {
-    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
-Math.round(this._base[i]+(this._delta[i]*position)
+(this._base[i]+(this._delta[i]*position)).round(
-  },
-  finish: function() {
@@ -523 +508 @@
-});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* ------------- combination effects ------------- */
@@ -554 +530 @@
-  var oldOpacity = element.getInlineOpacity();
-  var options = Object.extend({
-
-
-
-
-
-
+
+
+
+
+
+
+
-  return new Effect.Opacity(element,options);
-
+;
-
-Effect.Appear = function(element) {
@@ -574 +551 @@
-  beforeSetup: function(effect) {
-    effect.element.setOpacity(effect.options.from).show(); 
-
+ 
-  return new Effect.Opacity(element,options);
-
+;
-
-Effect.Puff = function(element) {
@@ -598 +575 @@
-      afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide().setStyle(oldStyle); }
-
+ 
-   );
-
+;
-
-Effect.BlindUp = function(element) {
@@ -612 +589 @@
-        effect.element.hide().undoClipping();
-      } 
-
+ 
-  );
-
+;
-
-Effect.BlindDown = function(element) {
@@ -631 +608 @@
-      effect.element.undoClipping();
-    }
-
-
+ 
+;
-
-Effect.SwitchOff = function(element) {
@@ -653 +630 @@
-      })
-    }
-
-
+ 
+;
-
-Effect.DropOut = function(element) {
@@ -673 +650 @@
-          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
-        } 
-
-
+ 
+;
-
-Effect.Shake = function(element) {
-  element = $(element);
+  var options = Object.extend({
+    distance: 20,
+    duration: 0.5
+  }, arguments[1] || {});
+  var distance = parseFloat(options.distance);
+  var split = parseFloat(options.duration) / 10.0;
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left') };
- 
-20, y: 0, duration: 0.05
+
+distance, y: 0, duration: split
-    new Effect.Move(effect.element,
-40, y: 0, duration: 0.1
+distance*2, y: 0, duration: split*2
-    new Effect.Move(effect.element,
-40, y: 0, duration: 0.1
+distance*2, y: 0, duration: split*2
-    new Effect.Move(effect.element,
-40, y: 0, duration: 0.1
+distance*2, y: 0, duration: split*2
-    new Effect.Move(effect.element,
-40, y: 0, duration: 0.1
+distance*2, y: 0, duration: split*2
-    new Effect.Move(effect.element,
-20, y: 0, duration: 0.05
+distance, y: 0, duration: split
-        effect.element.undoPositioned().setStyle(oldStyle);
-  }}) }}) }}) }}) }}) }});
-
+;
-
-Effect.SlideDown = function(element) {
@@ -711 +694 @@
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-
+ 
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
-    },
@@ -721 +704 @@
-      effect.element.undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
-
+ 
-  );
-
+;
-
-Effect.SlideUp = function(element) {
-  element = $(element).cleanWhitespace();
-  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false, 
@@ -733 +717 @@
-    scaleMode: 'box',
-    scaleFrom: 100,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-beforeStartInternal
+afterSetup
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-
+ 
-      effect.element.makeClipping().show();
-    },  
@@ -745 +730 @@
-    },
-    afterFinishInternal: function(effect) {
-.setStyle({bottom: oldInnerBottom})
-
-
-
+
+.setStyle({bottom: oldInnerBottom})
+
+ 
-  );
-
+;
-
-// Bug in opera makes the TD containing this element expand for a instance after finish 
@@ -763 +748 @@
-    }
-  });
-
+;
-
-Effect.Grow = function(element) {
@@ -772 +757 @@
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.full
-
+ 
-  var oldStyle = {
-    top: element.style.top,
@@ -837 +822 @@
-    }
-  });
-
+;
-
-Effect.Shrink = function(element) {
@@ -846 +831 @@
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.none
-
+ 
-  var oldStyle = {
-    top: element.style.top,
@@ -891 +876 @@
-       }, options)
-  );
-
+;
-
-Effect.Pulsate = function(element) {
-  element = $(element);
-
+ 
-  var oldOpacity = element.getInlineOpacity();
-  var transition = options.transition || Effect.Transitions.sinoidal;
@@ -904 +889 @@
-      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
-    }, options), {transition: reverser}));
-
+;
-
-Effect.Fold = function(element) {
@@ -924 +909 @@
-        effect.element.hide().undoClipping().setStyle(oldStyle);
-      } });
-
-
-
-
-
+
+
+
+
-  initialize: function(element) {
-    this.element = $(element);
-
+ 
-    var options = Object.extend({
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        });
-
-
+
-          effect.element.addClassName(effect.options.style);
-          effect.transforms.each(function(transform) {
-
-
+
-          });
-        }
- else this.style = options.style.parseStyle();
- else this.style = $H(options.style)
+
+
-    this.start(options);
-  },
+  
-  setup: function(){
-    function parseColor(color){
-
+ 
-      color = color.parseColor();
-      return $R(0,2).map(function(i){
@@ -970 +952 @@
-    }
-    this.transforms = this.style.map(function(pair){
-.underscore().dasherize()
-
-
+
+
+ 
-        value = value.parseColor();
-        unit  = 'color';
-
+ 
-        value = parseFloat(value);
-(/MSIE/.test(navigator.userAgent) && !window.opera
+ (Prototype.Browser.IE
-          this.element.setStyle({zoom: 1});
-
-
-
+
+
+
+
+
-
-      var originalValue = this.element.getStyle(property);
-$H(
-
+
+.camelize()
-        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), 
-        targetValue: unit=='color' ? parseColor(value) : value,
-        unit: unit
-)
+
-    }.bind(this)).reject(function(transform){
-      return (
@@ -1001 +985 @@
-  },
-  update: function(position) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-});
-
-
-
+
-  initialize: function(tracks){
-    this.tracks  = [];
-
+ 
-    this.addTracks(tracks);
-  },
-  addTracks: function(tracks){
-    tracks.each(function(track){
-
+
+
-      this.tracks.push($H({
-$H(track)
+track
-        effect:  Effect.Morph,
-        options: { style: data }
@@ -1036 +1023 @@
-    return new Effect.Parallel(
-      this.tracks.map(function(track){
-
-
+
+
+
-      }).flatten(),
-      this.options
@@ -1057 +1045 @@
-Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
-
+String.__parseStyleElement = document.createElement('div');
-String.prototype.parseStyle = function(){
-
-
-
+
+
+
+
+
+
+
-  
-  Element.CSS_PROPERTIES.each(function(property){
-(style[property]) styleRules[property] = style[property]
+ (style[property]) styleRules.set(property, style[property])
-  });
-
-
-
+
+
+
+
-  return styleRules;
-};
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-);
-
-
-
-
-
-
-
-
-
+
+
+
+
+

branches/1.1/data/web/sf/prototype/js/prototype.js

@@ -1 @@
-5.0
-7
+6.0.2
+8
- *
- *  Prototype is freely distributable under the terms of an MIT-style license.
-prototype.conio.net
+www.prototypejs.org
- *
-/
+ 
-
-var Prototype = {
-
+
+
+
+
+
+
+
+
+
+
-  BrowserFeatures: {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  K: function(x) { return x }
-
-
+
+
+
+
+
+
+
-var Class = {
-  create: function() {
-
+
+
+
+
+
-      this.initialize.apply(this, arguments);
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Object.extend = function(destination, source) {
- {
+
-    destination[property] = source[property];
-  }
-  return destination;
-
+;
-
-Object.extend(Object, {
-  inspect: function(object) {
-    try {
-object === undefined
+Object.isUndefined(object)
-      if (object === null) return 'null';
-object.toString(
+String(object
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
-      throw e;
-    }
+  },
+
+  toJSON: function(object) {
+    var type = typeof object;
+    switch (type) {
+      case 'undefined':
+      case 'function':
+      case 'unknown': return;
+      case 'boolean': return object.toString();
+    }
+
+    if (object === null) return 'null';
+    if (object.toJSON) return object.toJSON();
+    if (Object.isElement(object)) return;
+
+    var results = [];
+    for (var property in object) {
+      var value = Object.toJSON(object[property]);
+      if (!Object.isUndefined(value))
+        results.push(property.toJSON() + ': ' + value);
+    }
+
+    return '{' + results.join(', ') + '}';
+  },
+
+  toQueryString: function(object) {
+    return $H(object).toQueryString();
+  },
+
+  toHTML: function(object) {
+    return object && object.toHTML ? object.toHTML() : String.interpret(object);
-  },
-
@@ -62 +164 @@
-
-  clone: function(object) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-});
+
+Function.prototype.defer = Function.prototype.delay.curry(0.01);
+
+Date.prototype.toJSON = function() {
+  return '"' + this.getUTCFullYear() + '-' +
+    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+    this.getUTCDate().toPaddedString(2) + 'T' +
+    this.getUTCHours().toPaddedString(2) + ':' +
+    this.getUTCMinutes().toPaddedString(2) + ':' +
+    this.getUTCSeconds().toPaddedString(2) + 'Z"';
+};
-
-var Try = {
@@ -106 +269 @@
-        returnValue = lambda();
-        break;
-
+ 
-    }
-
-    return returnValue;
-  }
-
+
+
+
+
+
+
+
-
-/*--------------------------------------------------------------------------*/
-
-
-
+
-  initialize: function(callback, frequency) {
-    this.callback = callback;
@@ -129 +297 @@
-  },
-
+  execute: function() {
+    this.callback(this);
+  },
+
-  stop: function() {
-    if (!this.timer) return;
@@ -139 +311 @@
-      try {
-        this.currentlyExecuting = true;
-callback(this
+execute(
-      } finally {
-        this.currentlyExecuting = false;
@@ -145 +317 @@
-    }
-  }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Object.extend(String.prototype, {
@@ -169 +351 @@
-  sub: function(pattern, replacement, count) {
-    replacement = this.gsub.prepareReplacement(replacement);
-count === undefined
+Object.isUndefined(count)
-
-    return this.gsub(pattern, function(match) {
@@ -179 +361 @@
-  scan: function(pattern, iterator) {
-    this.gsub(pattern, iterator);
-this
+String(this)
-  },
-
-  truncate: function(length, truncation) {
-    length = length || 30;
-truncation === undefined
+Object.isUndefined(truncation)
-    return this.length > length ?
-this
+String(this)
-  },
-
@@ -214 +396 @@
-
-  escapeHTML: function() {
-
-
-
-
+
+
+
-  },
-
-  unescapeHTML: function() {
-document.create
+new 
-    div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? (div.childNodes.length > 1 ?
-function(memo,node)
+ function(memo, node) 
-      div.childNodes[0].nodeValue) : '';
-  },
@@ -230 +411 @@
-  toQueryParams: function(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-
-
-
+ 
+
+ 
-      if ((pair = pair.split('='))[0]) {
-name = decodeURIComponent(pair[0]
-[1] ? decodeURIComponent(pair[1]) : undefined
-
-
-  if (hash[name].constructor != Array)
-  hash[name] = [hash[name
-if (value) hash[name
+key = decodeURIComponent(pair.shift()
+.length > 1 ? pair.join('=') : pair[0]
+
+
+if (key in hash) {
+if (!Object.isArray(hash[key])) hash[key] = [hash[key
+hash[key
-        }
-name
+key
-      }
-      return hash;
@@ -257 +438 @@
-  },
-
+  times: function(count) {
+    return count < 1 ? '' : new Array(count + 1).join(this);
+  },
+
-  camelize: function() {
-    var parts = this.split('-'), len = parts.length;
@@ -271 +456 @@
-  },
-
-
+ 
-    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-  },
@@ -284 +469 @@
-
-  inspect: function(useDoubleQuotes) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-});
-
+if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
+  escapeHTML: function() {
+    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  },
+  unescapeHTML: function() {
+    return this.replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
+  }
+});
+
-String.prototype.gsub.prepareReplacement = function(replacement) {
-typeof replacement == 'function'
+Object.isFunction(replacement)
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
-
+;
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
-
-
-
+
+
+
+
+
+
+
+
-  initialize: function(template, pattern) {
-    this.template = template.toString();
- 
+
-  },
-
-  evaluate: function(object) {
+    if (Object.isFunction(object.toTemplateReplacements))
+      object = object.toTemplateReplacements();
+
-    return this.template.gsub(this.pattern, function(match) {
-
+
+
+
-      if (before == '\\') return match[2];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    });
-  }
-
-
-
-continue = new Object()
+);
+
+
+break = { }
-
-var Enumerable = {
-
+, context
-    var index = 0;
+    iterator = iterator.bind(context);
-    try {
-      this._each(function(value) {
-
-
-
-
-
+
-      });
-    } catch (e) {
@@ -337 +601 @@
-  },
-
-
+
+
-    var index = -number, slices = [], array = this.toArray();
-    while ((index += number) < array.length)
-      slices.push(array.slice(index, index+number));
-
-
-
-
+
+
+
+
+
-    var result = true;
-    this.each(function(value, index) {
-(iterator || Prototype.K)
+iterator
-      if (!result) throw $break;
-    });
@@ -353 +619 @@
-  },
-
-
+
+
-    var result = false;
-    this.each(function(value, index) {
-(iterator || Prototype.K)
+iterator
-        throw $break;
-    });
@@ -362 +629 @@
-  },
-
-
+
+
-    var results = [];
-    this.each(function(value, index) {
-(iterator || Prototype.K)
+iterator
-    });
-    return results;
-  },
-
-
+
+
-    var result;
-    this.each(function(value, index) {
@@ -381 +650 @@
-  },
-
-
+
+
-    var results = [];
-    this.each(function(value, index) {
@@ -390 +660 @@
-  },
-
-
+
+
-    var results = [];
+
+    if (Object.isString(filter))
+      filter = new RegExp(filter);
+
-    this.each(function(value, index) {
-
-
-
-
+
+
+
-    return results;
-  },
-
-  include: function(object) {
+    if (Object.isFunction(this.indexOf))
+      if (this.indexOf(object) != -1) return true;
+
-    var found = false;
-    this.each(function(value) {
@@ -412 +689 @@
-
-  inGroupsOf: function(number, fillWith) {
-fillWith === undefined
+Object.isUndefined(fillWith)
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
@@ -419 +696 @@
-  },
-
-
+
+
-    this.each(function(value, index) {
-      memo = iterator(memo, value, index);
@@ -433 +711 @@
-  },
-
-
+
+
-    var result;
-    this.each(function(value, index) {
-(iterator || Prototype.K)
-undefined
+iterator
+null
-        result = value;
-    });
@@ -443 +722 @@
-  },
-
-
+
+
-    var result;
-    this.each(function(value, index) {
-(iterator || Prototype.K)
-undefined
+iterator
+null
-        result = value;
-    });
@@ -453 +733 @@
-  },
-
-
+
+
-    var trues = [], falses = [];
-    this.each(function(value, index) {
-(iterator || Prototype.K)
+iterator
-        trues : falses).push(value);
-    });
@@ -464 +745 @@
-  pluck: function(property) {
-    var results = [];
-, index
+
-      results.push(value[property]);
-    });
@@ -470 +751 @@
-  },
-
-
+
+
-    var results = [];
-    this.each(function(value, index) {
@@ -479 +761 @@
-  },
-
-
+
+
-    return this.map(function(value, index) {
-      return {value: value, criteria: iterator(value, index)};
@@ -494 +777 @@
-  zip: function() {
-    var iterator = Prototype.K, args = $A(arguments);
-typeof args.last() == 'function'
+Object.isFunction(args.last())
-      iterator = args.pop();
-
@@ -510 +793 @@
-    return '#<Enumerable:' + this.toArray().inspect() + '>';
-  }
-
+;
-
-Object.extend(Enumerable, {
@@ -516 +799 @@
-  find:    Enumerable.detect,
-  select:  Enumerable.findAll,
+  filter:  Enumerable.findAll,
-  member:  Enumerable.include,
-
+
+
+
-});
-var $A = Array.from = function
+function $A
-  if (!iterable) return [];
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return results;
-
+;
-}
-
+Array.from = $A;
+
-Object.extend(Array.prototype, Enumerable);
-
-
-
+
-
-Object.extend(Array.prototype, {
@@ -563 +857 @@
-  flatten: function() {
-    return this.inject([], function(array, value) {
-value && value.constructor == Array
+Object.isArray(value)
-        value.flatten() : [value]);
-    });
@@ -575 +869 @@
-  },
-
-  indexOf: function(object) {
-    for (var i = 0, length = this.length; i < length; i++)
-      if (this[i] == object) return i;
-    return -1;
-  },
-
-  reverse: function(inline) {
-    return (inline !== false ? this : this.toArray())._reverse();
@@ -589 +877 @@
-  },
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    });
-  },
@@ -605 +901 @@
-  inspect: function() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
+  },
+
+  toJSON: function() {
+    var results = [];
+    this.each(function(object) {
+      var value = Object.toJSON(object);
+      if (!Object.isUndefined(value)) results.push(value);
+    });
+    return '[' + results.join(', ') + ']';
-  }
-});
-
+// use native browser JS 1.6 implementation if available
+if (Object.isFunction(Array.prototype.forEach))
+  Array.prototype._each = Array.prototype.forEach;
+
+if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
+  i || (i = 0);
+  var length = this.length;
+  if (i < 0) i = length + i;
+  for (; i < length; i++)
+    if (this[i] === item) return i;
+  return -1;
+};
+
+if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
+  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
+  var n = this.slice(0, i).reverse().indexOf(item);
+  return (n < 0) ? n : i - n - 1;
+};
+
-Array.prototype.toArray = Array.prototype.clone;
-
-
+
+
-  string = string.strip();
-  return string ? string.split(/\s+/) : [];
-}
-
-(window.o
-
+ (Prototype.Browser.O
+ 
-    var array = [];
-
-
-(arguments[i].constructor == Array
-
+ 
+ 
+ (Object.isArray(arguments[i])
+ 
-          array.push(arguments[i][j]);
-      } else {
@@ -628 +953 @@
-    }
-    return array;
-
+;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-});
-
-function $H(object) {
-  if (object && object.constructor == Hash) return object;
-  return new Hash(object);
-};
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  initialize: function(start, end, exclusive) {
-    this.start = start;
@@ -749 +1107 @@
-var $R = function(start, end, exclusive) {
-  return new ObjectRange(start, end, exclusive);
-
+;
-
-var Ajax = {
@@ -761 +1119 @@
-
-  activeRequestCount: 0
-
+;
-
-Ajax.Responders = {
@@ -781 +1139 @@
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-typeof responder[callback] == 'function'
+Object.isFunction(responder[callback])
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-
+ 
-      }
-    });
@@ -793 +1151 @@
-
-Ajax.Responders.register({
-
-
-
-
-
-
+
+
-});
-
-
-
-
+
+
-    this.options = {
-      method:       'post',
@@ -809 +1162 @@
-      contentType:  'application/x-www-form-urlencoded',
-      encoding:     'UTF-8',
-
-
-
+
+
+
+
+
-
-    this.options.method = this.options.method.toLowerCase();
-
+
+
-      this.options.parameters = this.options.parameters.toQueryParams();
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-  _complete: false,
-
-
+
+
-    this.transport = Ajax.getTransport();
-    this.setOptions(options);
-    this.request(url);
-  },
@@ -835 +1189 @@
-    this.url = url;
-    this.method = this.options.method;
-this.options.parameters
+Object.clone(this.options.parameters)
-
-    if (!['get', 'post'].include(this.method)) {
@@ -843 +1197 @@
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    try {
-
+
+
+
-
-      this.transport.open(this.method.toUpperCase(), this.url,
-        this.options.asynchronous);
-
-
-
+
-
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-
-
-
+
+
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
@@ -906 +1263 @@
-      var extras = this.options.requestHeaders;
-
-typeof extras.push == 'function'
+Object.isFunction(extras.push)
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
@@ -918 +1275 @@
-
-  success: function() {
-
-
+
+
+
+
+
+
+
+
-  },
-
-  respondToReadyState: function(readyState) {
-
-
+
-
-    if (state == 'Complete') {
-      try {
-        this._complete = true;
-this.transport
+response
-         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-transport, json
+response, response.headerJSON
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-
-
-
+
+
+
+
+
-    }
-
-    try {
-transport, json
-transport, json
+response, response.headerJSON
+response, response.headerJSON
-    } catch (e) {
-      this.dispatchException(e);
@@ -954 +1318 @@
-  },
-
+  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 {
-
-
-
-
-
-
-
-
+
-    } catch (e) { return null }
-  },
@@ -969 +1335 @@
-  evalResponse: function() {
-    try {
-this.transport.responseText
+(this.transport.responseText || '').unfilterJSON()
-    } catch (e) {
-      this.dispatchException(e);
@@ -981 +1347 @@
-});
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }).bind(this);
-
-this.request(url
-
-
-
-;
-var response = this.transport.responseText
-
-this.options.evalScripts) response = response
+$super(url, options
+
+
+responseText
+,
+    options = this.options
+
+options.evalScripts) responseText = responseText
-
-    if (receiver = $(receiver)) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-  }
-});
-
-
-
-
-
+
+
+
-    this.onComplete = this.options.onComplete;
-
@@ -1031 +1468 @@
-    this.decay = (this.options.decay || 1);
-
-
+ 
-    this.container = container;
-    this.url = url;
@@ -1049 +1486 @@
-  },
-
-quest
+sponse
-    if (this.options.decay) {
-quest
+sponse
-        this.decay * this.options.decay : 1);
-
-
-
-
-
+
+
+
-  },
-
@@ -1070 +1506 @@
-    return elements;
-  }
-typeof element == 'string'
+Object.isString(element)
-    element = document.getElementById(element);
-  return Element.extend(element);
@@ -1081 +1517 @@
-      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    for (var i = 0, length = query.snapshotLength; i < length; i++)
-query.snapshotItem(i
+Element.extend(query.snapshotItem(i)
-    return results;
-  };
-}
-
-document.getElementsByClassName = function(className, parentElement) {
-  if (Prototype.BrowserFeatures.XPath) {
-    var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]";
-    return document._getElementsByXPath(q, parentElement);
-  } else {
-    var children = ($(parentElement) || document.body).getElementsByTagName('*');
-    var elements = [], child;
-    for (var i = 0, length = children.length; i < length; i++) {
-      child = children[i];
-      if (Element.hasClassName(child, className))
-        elements.push(Element.extend(child));
-    }
-    return elements;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Element.Methods = {
@@ -1166 +1590 @@
-  },
-
-
-
-
-
+
+
+
+
+
+
+
-    return element;
-  },
-
-html
+content
-    element = $(element);
-
-
-
-
+
+
+
-      var range = element.ownerDocument.createRange();
-Contents
-element.parentNode.replaceChild(
-  range.createContextualFragment(html.stripScripts()), element
-
-setTimeout(function() {html.evalScripts()}, 10
+
+content.evalScripts.bind(content).defer();
+content = range.createContextualFragment(content.stripScripts()
+
+element.parentNode.replaceChild(content, element
-    return element;
+  },
+
+  insert: function(element, insertions) {
+    element = $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
+          insertions = {bottom:insertions};
+
+    var content, insert, tagName, childNodes;
+
+    for (var position in insertions) {
+      content  = insertions[position];
+      position = position.toLowerCase();
+      insert = Element._insertionTranslations[position];
+
+      if (content && content.toElement) content = content.toElement();
+      if (Object.isElement(content)) {
+        insert(element, content);
+        continue;
+      }
+
+      content = Object.toHTML(content);
+
+      tagName = ((position == 'before' || position == 'after')
+        ? element.parentNode : element).tagName.toUpperCase();
+
+      childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+
+      if (position == 'top' || position == 'after') childNodes.reverse();
+      childNodes.each(insert.curry(element));
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  },
+
+  wrap: function(element, wrapper, attributes) {
+    element = $(element);
+    if (Object.isElement(wrapper))
+      $(wrapper).writeAttribute(attributes || { });
+    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
+    else wrapper = new Element('div', wrapper);
+    if (element.parentNode)
+      element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return wrapper;
-  },
-
@@ -1213 +1687 @@
-
-  descendants: function(element) {
-
+
+
+
+
+
+
+
-  },
-
@@ -1237 +1717 @@
-
-  match: function(element, selector) {
-typeof selector == 'string'
+Object.isString(selector)
-      selector = new Selector(selector);
-    return selector.match($(element));
@@ -1243 +1723 @@
-
-  up: function(element, expression, index) {
-
+
+
+
+
+
-  },
-
-  down: function(element, expression, index) {
-
+
+
+
+
-  },
-
-  previous: function(element, expression, index) {
-
+
+
+
+
+
-  },
-
-  next: function(element, expression, index) {
-
-
-
-
+
+
+
+
+
+
+
+
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element, args);
-  },
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  },
-
-  readAttribute: function(element, name) {
-    element = $(element);
-document.all && !window.opera
-
+Prototype.Browser.IE
+.read
-      if (t.values[name]) return t.values[name](element, name);
-
-
-
+
+
+
+
+
-    }
-    return element.getAttribute(name);
+  },
+
+  writeAttribute: function(element, name, value) {
+    element = $(element);
+    var attributes = { }, t = Element._attributeTranslations.write;
+
+    if (typeof name == 'object') attributes = name;
+    else attributes[name] = Obje