Changeset 5015

Timestamp:

09/05/06 10:42:41 (2 years ago)

Author:

madrobby

Message:

Update to script.aculo.us 1.6.3 [Thomas Fuchs]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/javascripts/controls.js (modified) (4 diffs)
• trunk/actionpack/lib/action_view/helpers/javascripts/dragdrop.js (modified) (20 diffs)
• trunk/actionpack/lib/action_view/helpers/javascripts/effects.js (modified) (10 diffs)
• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/html/javascripts/controls.js (modified) (4 diffs)
• trunk/railties/html/javascripts/dragdrop.js (modified) (20 diffs)
• trunk/railties/html/javascripts/effects.js (modified) (10 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update to script.aculo.us 1.6.3 [Thomas Fuchs]
-
-* Update to Prototype 1.5.0_rc1 [sam]

trunk/actionpack/lib/action_view/helpers/javascripts/controls.js

@@ -49 +49 @@
-    this.entryCount  = 0;
-
- 
+
-      this.setOptions(options);
-    else
@@ -59 +59 @@
-    this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow || 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    this.options.onHide = this.options.onHide || 
-
-
- 
+  
+
+
-      this.options.tokens = new Array(this.options.tokens);
-
@@ -275 +278 @@
-
-      this.stopIndicator();
-
-      this.index = 0;
-
+
+
+
+
+
+
+
-    }
-  },
@@ -779 +787 @@
-        optionTag = document.createElement("option");
-        optionTag.value = (e instanceof Array) ? e[0] : e;
+        if((typeof this.options.value == 'undefined') && 
+          ((e instanceof Array) ? this.element.innerHTML == e[1] : e == optionTag.value)) optionTag.selected = true;
-        if(this.options.value==optionTag.value) optionTag.selected = true;
-        optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));

trunk/actionpack/lib/action_view/helpers/javascripts/dragdrop.js

@@ -149 +149 @@
-  
-  activate: function(draggable) {
-
-
+
+
+
+
+
+
+
+
+
+
-  },
-  
@@ -164 +172 @@
-    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
-    this._lastPointer = pointer;
+    
-    this.activeDraggable.updateDrag(event, pointer);
-  },
-  
-  endDrag: function(event) {
+    if(this._timeout) { 
+      clearTimeout(this._timeout); 
+      this._timeout = null; 
+    }
-    if(!this.activeDraggable) return;
-    this._lastPointer = null;
@@ -194 +207 @@
-        if(o[eventName]) o[eventName](eventName, draggable, event);
-      });
+    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
-  },
-  
@@ -208 +222 @@
-
-var Draggable = Class.create();
-Draggable._revertCache = {};
-Draggable._dragging    = {};
-
-Draggable.prototype = {
-  initialize: function(element) {
-options = Object.extend(
+defaults = 
-      handle: false,
-      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}); 
-      },
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-
-
-
-
+
+
+
-      },
-      endeffect: function(element) {
@@ -231 +238 @@
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
-          queue: {scope:'_draggable', position:'end'},
-
+
+
+
-        }); 
-      },
@@ -239 +248 @@
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    this.element = $(element);
@@ -251 +272 @@
-    if(!this.handle) this.handle = this.element;
-    
-
+ {
-      options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
-
-    Element.makePositioned(this.element); // fix IE    
@@ -278 +301 @@
-  
-  initDrag: function(event) {
-undefined
+'undefined'
-      Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
@@ -290 +313 @@
-        src.tagName=='TEXTAREA')) return;
-        
-      if(Draggable._revertCache[this.element]) {
-        Draggable._revertCache[this.element].cancel();
-        Draggable._revertCache[this.element] = null;
-      }
-      
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      var pos     = Position.cumulativeOffset(this.element);
@@ -330 +348 @@
-    
-    Draggables.notify('onStart', this, event);
+        
-    if(this.options.starteffect) this.options.starteffect(this.element);
-  },
@@ -338 +357 @@
-    Droppables.show(pointer, this.element);
-    Draggables.notify('onDrag', this, event);
+    
-    this.draw(pointer);
-    if(this.options.change) this.options.change(this);
@@ -351 +371 @@
-        p[0] += this.options.scroll.scrollLeft;
-        p[1] += this.options.scroll.scrollTop;
+        
+        p[0] += (window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0);
+        p[1] += (window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0);
+        
-        p.push(p[0]+this.options.scroll.offsetWidth);
-        p.push(p[1]+this.options.scroll.offsetHeight);
@@ -396 +420 @@
-    if(this.options.endeffect) 
-      this.options.endeffect(this.element);
-
+
-    Draggables.deactivate(this);
-    Droppables.reset();
@@ -416 +440 @@
-  draw: function(point) {
-    var pos = Position.cumulativeOffset(this.element);
+    if(this.options.ghosting) {
+      var r   = Position.realOffset(this.element);
+      window.status = r.inspect();
+      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
+    }
+    
-    var d = this.currentDelta();
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-
+ && this._isScrollChild
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
@@ -446 +476 @@
-    if((!this.options.constraint) || (this.options.constraint=='vertical'))
-      style.top  = p[1] + "px";
+    
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
-  },
@@ -483 +514 @@
-    Droppables.show(Draggables._lastPointer, this.element);
-    Draggables.notify('onDrag', this);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    
-    if(this.options.change) this.options.change(this);
@@ -542 +575 @@
-
-var Sortable = {
+  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
+  
-  sortables: {},
-  
@@ -582 +617 @@
-      handle:      false,      // or a CSS class
-      only:        false,
+      delay:       0,
-      hoverclass:  null,
-      ghosting:    false,
@@ -587 +623 @@
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-/^[^_]*_(.*)$/
+this.SERIALIZE_RULE
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
@@ -601 +637 @@
-      scrollSpeed: options.scrollSpeed,
-      scrollSensitivity: options.scrollSensitivity,
+      delay:       options.delay,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,

trunk/actionpack/lib/action_view/helpers/javascripts/effects.js

@@ -60 +60 @@
-    Element.setStyle(element, { opacity: 
-      (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 
-null
-
+1.0
+ && !window.opera
-      Element.setStyle(element, {filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'')});  
-  } else {  
-    if(value < 0.00001) value = 0;  
-    Element.setStyle(element, {opacity: value});
-
+ && !window.opera
-     Element.setStyle(element, 
-       { filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'') +
@@ -105 +105 @@
-
-var Effect = {
+  _elementDoesNotExistError: {
+    name: 'ElementDoesNotExistError',
+    message: 'The specified DOM element does not exist, but is required for this effect to operate'
+  },
-  tagifyText: function(element) {
-    if(typeof Builder == 'undefined')
@@ -110 +114 @@
-      
-    var tagifyStyle = 'position:relative';
-
+ && !window.opera
-    element = $(element);
-    $A(element.childNodes).each( function(child) {
@@ -355 +359 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    // make this work on IE on elements without 'layout'
-
+!window.opera && 
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
@@ -373 +378 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      x:    0,
@@ -411 +417 @@
-Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
-  initialize: function(element, percent) {
-
+
+
-    var options = Object.extend({
-      scaleX: true,
@@ -486 +493 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
-    this.start(options);
@@ -574 +582 @@
-Effect.Puff = function(element) {
-  element = $(element);
-
+
+
+
+
+
+
+
+
-  return new Effect.Parallel(
-   [ new Effect.Scale(element, 200, 
@@ -581 +596 @@
-     Object.extend({ duration: 1.0, 
-      beforeSetupInternal: function(effect) {
-
+
+
-      afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide();
@@ -720 +736 @@
-      effect.element.undoClipping(); 
-      // IE will crash if child is undoPositioned first
-
+ && !window.opera
-        effect.element.undoPositioned();
-        effect.element.firstChild.undoPositioned();

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update to script.aculo.us 1.6.3 [Thomas Fuchs]
-
-* Update to Prototype 1.5.0_rc1 [sam]

trunk/railties/html/javascripts/controls.js

@@ -49 +49 @@
-    this.entryCount  = 0;
-
- 
+
-      this.setOptions(options);
-    else
@@ -59 +59 @@
-    this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow || 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    this.options.onHide = this.options.onHide || 
-
-
- 
+  
+
+
-      this.options.tokens = new Array(this.options.tokens);
-
@@ -275 +278 @@
-
-      this.stopIndicator();
-
-      this.index = 0;
-
+
+
+
+
+
+
+
-    }
-  },
@@ -779 +787 @@
-        optionTag = document.createElement("option");
-        optionTag.value = (e instanceof Array) ? e[0] : e;
+        if((typeof this.options.value == 'undefined') && 
+          ((e instanceof Array) ? this.element.innerHTML == e[1] : e == optionTag.value)) optionTag.selected = true;
-        if(this.options.value==optionTag.value) optionTag.selected = true;
-        optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));

trunk/railties/html/javascripts/dragdrop.js

@@ -149 +149 @@
-  
-  activate: function(draggable) {
-
-
+
+
+
+
+
+
+
+
+
+
-  },
-  
@@ -164 +172 @@
-    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
-    this._lastPointer = pointer;
+    
-    this.activeDraggable.updateDrag(event, pointer);
-  },
-  
-  endDrag: function(event) {
+    if(this._timeout) { 
+      clearTimeout(this._timeout); 
+      this._timeout = null; 
+    }
-    if(!this.activeDraggable) return;
-    this._lastPointer = null;
@@ -194 +207 @@
-        if(o[eventName]) o[eventName](eventName, draggable, event);
-      });
+    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
-  },
-  
@@ -208 +222 @@
-
-var Draggable = Class.create();
-Draggable._revertCache = {};
-Draggable._dragging    = {};
-
-Draggable.prototype = {
-  initialize: function(element) {
-options = Object.extend(
+defaults = 
-      handle: false,
-      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}); 
-      },
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-
-
-
-
+
+
+
-      },
-      endeffect: function(element) {
@@ -231 +238 @@
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
-          queue: {scope:'_draggable', position:'end'},
-
+
+
+
-        }); 
-      },
@@ -239 +248 @@
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    this.element = $(element);
@@ -251 +272 @@
-    if(!this.handle) this.handle = this.element;
-    
-
+ {
-      options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
-
-    Element.makePositioned(this.element); // fix IE    
@@ -278 +301 @@
-  
-  initDrag: function(event) {
-undefined
+'undefined'
-      Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
@@ -290 +313 @@
-        src.tagName=='TEXTAREA')) return;
-        
-      if(Draggable._revertCache[this.element]) {
-        Draggable._revertCache[this.element].cancel();
-        Draggable._revertCache[this.element] = null;
-      }
-      
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      var pos     = Position.cumulativeOffset(this.element);
@@ -330 +348 @@
-    
-    Draggables.notify('onStart', this, event);
+        
-    if(this.options.starteffect) this.options.starteffect(this.element);
-  },
@@ -338 +357 @@
-    Droppables.show(pointer, this.element);
-    Draggables.notify('onDrag', this, event);
+    
-    this.draw(pointer);
-    if(this.options.change) this.options.change(this);
@@ -351 +371 @@
-        p[0] += this.options.scroll.scrollLeft;
-        p[1] += this.options.scroll.scrollTop;
+        
+        p[0] += (window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0);
+        p[1] += (window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0);
+        
-        p.push(p[0]+this.options.scroll.offsetWidth);
-        p.push(p[1]+this.options.scroll.offsetHeight);
@@ -396 +420 @@
-    if(this.options.endeffect) 
-      this.options.endeffect(this.element);
-
+
-    Draggables.deactivate(this);
-    Droppables.reset();
@@ -416 +440 @@
-  draw: function(point) {
-    var pos = Position.cumulativeOffset(this.element);
+    if(this.options.ghosting) {
+      var r   = Position.realOffset(this.element);
+      window.status = r.inspect();
+      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
+    }
+    
-    var d = this.currentDelta();
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-
+ && this._isScrollChild
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
@@ -446 +476 @@
-    if((!this.options.constraint) || (this.options.constraint=='vertical'))
-      style.top  = p[1] + "px";
+    
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
-  },
@@ -483 +514 @@
-    Droppables.show(Draggables._lastPointer, this.element);
-    Draggables.notify('onDrag', this);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    
-    if(this.options.change) this.options.change(this);
@@ -542 +575 @@
-
-var Sortable = {
+  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
+  
-  sortables: {},
-  
@@ -582 +617 @@
-      handle:      false,      // or a CSS class
-      only:        false,
+      delay:       0,
-      hoverclass:  null,
-      ghosting:    false,
@@ -587 +623 @@
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-/^[^_]*_(.*)$/
+this.SERIALIZE_RULE
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
@@ -601 +637 @@
-      scrollSpeed: options.scrollSpeed,
-      scrollSensitivity: options.scrollSensitivity,
+      delay:       options.delay,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,

trunk/railties/html/javascripts/effects.js

@@ -60 +60 @@
-    Element.setStyle(element, { opacity: 
-      (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 
-null
-
+1.0
+ && !window.opera
-      Element.setStyle(element, {filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'')});  
-  } else {  
-    if(value < 0.00001) value = 0;  
-    Element.setStyle(element, {opacity: value});
-
+ && !window.opera
-     Element.setStyle(element, 
-       { filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'') +
@@ -105 +105 @@
-
-var Effect = {
+  _elementDoesNotExistError: {
+    name: 'ElementDoesNotExistError',
+    message: 'The specified DOM element does not exist, but is required for this effect to operate'
+  },
-  tagifyText: function(element) {
-    if(typeof Builder == 'undefined')
@@ -110 +114 @@
-      
-    var tagifyStyle = 'position:relative';
-
+ && !window.opera
-    element = $(element);
-    $A(element.childNodes).each( function(child) {
@@ -355 +359 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    // make this work on IE on elements without 'layout'
-
+!window.opera && 
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
@@ -373 +378 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      x:    0,
@@ -411 +417 @@
-Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
-  initialize: function(element, percent) {
-
+
+
-    var options = Object.extend({
-      scaleX: true,
@@ -486 +493 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
-    this.start(options);
@@ -574 +582 @@
-Effect.Puff = function(element) {
-  element = $(element);
-
+
+
+
+
+
+
+
+
-  return new Effect.Parallel(
-   [ new Effect.Scale(element, 200, 
@@ -581 +596 @@
-     Object.extend({ duration: 1.0, 
-      beforeSetupInternal: function(effect) {
-
+
+
-      afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide();
@@ -720 +736 @@
-      effect.element.undoClipping(); 
-      // IE will crash if child is undoPositioned first
-
+ && !window.opera
-        effect.element.undoPositioned();
-        effect.element.firstChild.undoPositioned();