Changeset 4043

Timestamp:

03/26/06 08:37:19 (3 years ago)

Author:

madrobby

Message:

Update to script.aculo.us 1.6

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/javascripts/dragdrop.js (modified) (8 diffs)
• trunk/actionpack/lib/action_view/helpers/javascripts/effects.js (modified) (39 diffs)
• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/html/javascripts/dragdrop.js (modified) (8 diffs)
• trunk/railties/html/javascripts/effects.js (modified) (39 diffs)
• trunk/railties/Rakefile (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update to script.aculo.us 1.6 [Thomas Fuchs]
-
-* Enable application/x-yaml processing by default [Jamis Buck]

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

@@ -213 +213 @@
-    if(!this.handle) this.handle = this.element;
-    
-
+
+
-
-    Element.makePositioned(this.element); // fix IE    
@@ -278 +279 @@
-    
-    if(this.options.scroll) {
-
-
+
+
+
+
+
+
+
+
-    }
-    
@@ -295 +302 @@
-    
-    if(this.options.scroll) {
-      //if(this.scrollInterval) this.scroll();
-      this.stopScrolling();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      var speed = [0,0];
-      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
@@ -367 +379 @@
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-
+ && (this.options.scroll != window)
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
@@ -414 +426 @@
-    var delta = current - this.lastScrolled;
-    this.lastScrolled = current;
-
-
+
+
+
+
+
+
+
+
+
+
+
-    
-    Position.prepare();
@@ -423 +444 @@
-    
-    if(this.options.change) this.options.change(this);
+  },
+  
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
-  }
-}
@@ -480 +525 @@
-      ghosting:    false,
-      scroll:      false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
-      format:      /^[^_]*_(.*)$/,
-      onChange:    Prototype.emptyFunction,
@@ -492 +539 @@
-      revert:      true,
-      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,

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

@@ -7 +7 @@
-// See scriptaculous.js for full license.  
-
-/* ------------- element ext -------------- */  
- 
-// converts rgb() and #xxx to #xxxxxx format,  
-// returns self (or first argument) if not convertable  
@@ -25 +23 @@
-}
-
+/*--------------------------------------------------------------------------*/
+
-Element.collectTextNodes = function(element) {  
-  return $A($(element).childNodes).collect( function(node) {
@@ -40 +40 @@
-}
-
-
-
-
-
-
-
+
+
-  Element.setStyle(element, {fontSize: (percent/100) + 'em'});   
-  
+
-}
-
@@ -74 +70 @@
-       { filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'') +
-                 'alpha(opacity='+value*100+')' });  
-   
+
-}  
- 
@@ -92 +88 @@
-    element.appendChild(n);
-    element.removeChild(n);
-
-
+
+
+
+
+
+
+
+
+
-
-Array.prototype.call = function() {
@@ -149 +152 @@
-      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
-    }, arguments[2] || {});
-Element.visible(element
+element.visible(
-      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
-  }
@@ -353 +356 @@
-    // make this work on IE on elements without 'layout'
-    if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout))
-Element.setStyle(this.element, 
+this.element.setStyle(
-    var options = Object.extend({
-Element.getOpacity(this.element
+this.element.getOpacity(
-      to:   1.0
-    }, arguments[1] || {});
@@ -361 +364 @@
-  },
-  update: function(position) {
-Element.setOpacity(this.element, 
+this.element.setOpacity(
-  }
-});
@@ -381 +384 @@
-    // ==> Always set top and left for position relative elements in your stylesheets 
-    // (to 0 if you do not need them) 
-Element.makePositioned(this.element
-Element.getStyle(this.element,
-Element.getStyle(this.element,
+this.element.makePositioned(
+this.element.getStyle(
+this.element.getStyle(
-    if(this.options.mode == 'absolute') {
-      // absolute movement, so we need to calc deltaX and deltaY
@@ -391 +394 @@
-  },
-  update: function(position) {
-Element.setStyle(this.element, 
+this.element.setStyle(
-      left: this.options.x  * position + this.originalLeft + 'px',
-      top:  this.options.y  * position + this.originalTop  + 'px'
@@ -421 +424 @@
-  setup: function() {
-    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
-Element.getStyle(this.element,
+this.element.getStyle(
-    
-    this.originalStyle = {};
@@ -431 +434 @@
-    this.originalLeft = this.element.offsetLeft;
-    
-Element.getStyle(this.element,
+this.element.getStyle(
-    ['em','px','%'].each( function(fontSizeType) {
-      if(fontSize.indexOf(fontSizeType)>0) {
@@ -453 +456 @@
-    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
-    if(this.options.scaleContent && this.fontSize)
-Element.setStyle(this.element, 
+this.element.setStyle(
-    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
-  },
-  finish: function(position) {
-Element.setStyle(this.element, 
+this.element.setStyle(
-  },
-  setDimensions: function(height, width) {
@@ -474 +477 @@
-      }
-    }
-Element.setStyle(this.element, 
+this.element.setStyle(
-  }
-});
@@ -487 +490 @@
-  setup: function() {
-    // Prevent executing on elements not in the layout flow
-Element.getStyle(this.element, 
+this.element.getStyle(
-    // Disable background image during the effect
-    this.oldStyle = {
-Element.getStyle(this.element, 
-Element.setStyle(this.element, 
+this.element.getStyle(
+this.element.setStyle(
-    if(!this.options.endcolor)
-Element.getStyle(this.element, 
+this.element.getStyle(
-    if(!this.options.restorecolor)
-Element.getStyle(this.element, 
+this.element.getStyle(
-    // init color calculations
-    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
@@ -501 +504 @@
-  },
-  update: function(position) {
-Element.setStyle(this.element,
+this.element.setStyle(
-      return m+(Math.round(this._base[i]+(this._delta[i]*position)).toColorPart()); }.bind(this)) });
-  },
-  finish: function() {
-Element.setStyle(this.element, 
+this.element.setStyle(
-      backgroundColor: this.options.restorecolor
-    }));
@@ -539 +542 @@
-
-Effect.Fade = function(element) {
-
+
+
-  var options = Object.extend({
-Element.getOpacity(element
+element.getOpacity(
-  to:   0.0,
-with(Element) { 
+
-    if(effect.options.to!=0) return;
-hide(effect.element
-setStyle(effect.element, {opacity: oldOpacity}); }}
-
+effect.element.hide(
+effect.element.setStyle({opacity: oldOpacity}); 
+}
-  return new Effect.Opacity(element,options);
-}
-
-Effect.Appear = function(element) {
+  element = $(element);
-  var options = Object.extend({
-Element.getStyle(element, 'display') == 'none' ? 0.0 : Element.getOpacity(element
+element.getStyle('display') == 'none' ? 0.0 : element.getOpacity(
-  to:   1.0,
-  // force Safari to render floated elements properly
-  afterFinishInternal: function(effect) {
-Element.forceRerendering(effect.element
-
- with(Element) {
-setOpacity(effect.element, 
-show(effect.element); }}
-
+effect.element.forceRerendering(
+
+
+effect.element.setOpacity(
+effect.element.show(); 
+}
-  return new Effect.Opacity(element,options);
-}
@@ -568 +573 @@
-Effect.Puff = function(element) {
-  element = $(element);
-Element.getInlineOpacity(element), position: Element.getStyle(element, 
+element.getInlineOpacity(), position: element.getStyle(
-  return new Effect.Parallel(
-   [ new Effect.Scale(element, 200, 
@@ -574 +579 @@
-     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], 
-     Object.extend({ duration: 1.0, 
-
-
-
-
-
+
+
+
+
-     }, arguments[1] || {})
-   );
@@ -585 +589 @@
-Effect.BlindUp = function(element) {
-  element = $(element);
-Element.makeClipping(element
+element.makeClipping(
-  return new Effect.Scale(element, 0, 
-    Object.extend({ scaleContent: false, 
-      scaleX: false, 
-      restoreAfterFinish: true,
-
-
+
+
+
+
-    }, arguments[1] || {})
-  );
@@ -598 +604 @@
-Effect.BlindDown = function(element) {
-  element = $(element);
-Element.getDimensions(element
+element.getDimensions(
-  return new Effect.Scale(element, 100, 
-    Object.extend({ scaleContent: false, 
@@ -605 +611 @@
-      scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-      restoreAfterFinish: true,
- with(Element) {
-makeClipping(effect.element
-setStyle(effect.element, 
-show(effect.element
-}
+
+effect.element.makeClipping(
+effect.element.setStyle(
+effect.element.show(
+
-      afterFinishInternal: function(effect) {
-Element.undoClipping(effect.element
+effect.element.undoClipping(
-      }
-    }, arguments[1] || {})
@@ -619 +625 @@
-Effect.SwitchOff = function(element) {
-  element = $(element);
-Element.getInlineOpacity(element
+element.getInlineOpacity(
-  return new Effect.Appear(element, { 
-    duration: 0.4,
@@ -628 +634 @@
-        duration: 0.3, scaleFromCenter: true,
-        scaleX: false, scaleContent: false, restoreAfterFinish: true,
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-      })
-    }
@@ -643 +652 @@
-  element = $(element);
-  var oldStyle = {
-Element.getStyle(element, 
-Element.getStyle(element, 
-Element.getInlineOpacity(element
+element.getStyle(
+element.getStyle(
+element.getInlineOpacity(
-  return new Effect.Parallel(
-    [ new Effect.Move(element, {x: 0, y: 100, sync: true }), 
@@ -651 +660 @@
-    Object.extend(
-      { duration: 0.5,
-
-
-
-
-
+
+
+
+
+
+
+
+
-      }, arguments[1] || {}));
-}
@@ -662 +674 @@
-  element = $(element);
-  var oldStyle = {
-Element.getStyle(element, 
-Element.getStyle(element, 
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-           { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effect) { with(Elemen
-undoPositioned(effect.element
-setStyle(effect.element, 
-}
+element.getStyle(
+element.getStyle(
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+      { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effec
+effect.element.undoPositioned(
+effect.element.setStyle(
+
-}
-
-Effect.SlideDown = function(element) {
-  element = $(element);
-Element.cleanWhitespace(element
+element.cleanWhitespace(
-  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-Element.getStyle(element.firstChild, 
-Element.getDimensions(element
+$(element.firstChild).getStyle(
+element.getDimensions(
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
@@ -693 +705 @@
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      // IE will crash if child is undoPositioned first
-      if(/MSIE/.test(navigator.userAgent)){
-undoPositioned(effect.element
-undoPositioned(effect.element.firstChild
+effect.element.undoPositioned(
+effect.element.firstChild.undoPositioned(
-      }else{
-undoPositioned(effect.element.firstChild
-undoPositioned(effect.element
+effect.element.firstChild.undoPositioned(
+effect.element.undoPositioned(
-      }
-setStyle(effect.element.firstChild, {bottom: oldInnerBottom}); }
+effect.element.firstChild.setStyle({bottom: oldInnerBottom}); 
-    }, arguments[1] || {})
-  );
@@ -720 +733 @@
-Effect.SlideUp = function(element) {
-  element = $(element);
-Element.cleanWhitespace(element
-Element.getStyle(element.firstChild, 
+element.cleanWhitespace(
+$(element.firstChild).getStyle(
-  return new Effect.Scale(element, 0, 
-   Object.extend({ scaleContent: false, 
@@ -728 +741 @@
-    scaleFrom: 100,
-    restoreAfterFinish: true,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   }, arguments[1] || {})
-  );
@@ -750 +764 @@
-  return new Effect.Scale(element, window.opera ? 1 : 0, 
-    { restoreAfterFinish: true,
- with(Element) {
-makeClipping(effect.element); }
- with(Element) {
-
-undoClipping(effect.element); }
+
+effect.element.makeClipping(effect.element); 
+
+effect.element.
+effect.element.undoClipping(effect.element); 
-  });
-}
@@ -771 +785 @@
-    height: element.style.height,
-    width: element.style.width,
-Element.getInlineOpacity(element
-
-Element.getDimensions(element
+element.getInlineOpacity(
+
+element.getDimensions(
-  var initialMoveX, initialMoveY;
-  var moveX, moveY;
@@ -809 +823 @@
-    y: initialMoveY,
-    duration: 0.01, 
- with(Element) {
-hide(effect.element
-makeClipping(effect.element
-makePositioned(effect.element
-}
+
+effect.element.hide(
+effect.element.makeClipping(
+effect.element.makePositioned(
+
-    afterFinishInternal: function(effect) {
-      new Effect.Parallel(
@@ -822 +836 @@
-            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
-        ], Object.extend({
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-           }, options)
-      )
@@ -847 +864 @@
-    height: element.style.height,
-    width: element.style.width,
-Element.getInlineOpacity(element
-
-Element.getDimensions(element
+element.getInlineOpacity(
+
+element.getDimensions(
-  var moveX, moveY;
-  
@@ -879 +896 @@
-      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
-    ], Object.extend({            
-
-
-
-
-
+
+
+
+
+
+
+
+
-       }, options)
-  );
@@ -891 +911 @@
-  element = $(element);
-  var options    = arguments[1] || {};
-Element.getInlineOpacity(element
+element.getInlineOpacity(
-  var transition = options.transition || Effect.Transitions.sinoidal;
-  var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos)) };
@@ -897 +917 @@
-  return new Effect.Opacity(element, 
-    Object.extend(Object.extend({  duration: 3.0, from: 0,
-Element.setStyle(effect.element, 
+effect.element.setStyle(
-    }, options), {transition: reverser}));
-}
@@ -916 +936 @@
-      scaleContent: false, 
-      scaleY: false,
-
-
-
-
+
+
+
+
+
-  }}, arguments[1] || {}));
-}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update to script.aculo.us 1.6 [Thomas Fuchs]
-
-* Add an integration_test generator [Jamis Buck]

trunk/railties/html/javascripts/dragdrop.js

@@ -213 +213 @@
-    if(!this.handle) this.handle = this.element;
-    
-
+
+
-
-    Element.makePositioned(this.element); // fix IE    
@@ -278 +279 @@
-    
-    if(this.options.scroll) {
-
-
+
+
+
+
+
+
+
+
-    }
-    
@@ -295 +302 @@
-    
-    if(this.options.scroll) {
-      //if(this.scrollInterval) this.scroll();
-      this.stopScrolling();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      var speed = [0,0];
-      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
@@ -367 +379 @@
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-
+ && (this.options.scroll != window)
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
@@ -414 +426 @@
-    var delta = current - this.lastScrolled;
-    this.lastScrolled = current;
-
-
+
+
+
+
+
+
+
+
+
+
+
-    
-    Position.prepare();
@@ -423 +444 @@
-    
-    if(this.options.change) this.options.change(this);
+  },
+  
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
-  }
-}
@@ -480 +525 @@
-      ghosting:    false,
-      scroll:      false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
-      format:      /^[^_]*_(.*)$/,
-      onChange:    Prototype.emptyFunction,
@@ -492 +539 @@
-      revert:      true,
-      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,

trunk/railties/html/javascripts/effects.js

@@ -7 +7 @@
-// See scriptaculous.js for full license.  
-
-/* ------------- element ext -------------- */  
- 
-// converts rgb() and #xxx to #xxxxxx format,  
-// returns self (or first argument) if not convertable  
@@ -25 +23 @@
-}
-
+/*--------------------------------------------------------------------------*/
+
-Element.collectTextNodes = function(element) {  
-  return $A($(element).childNodes).collect( function(node) {
@@ -40 +40 @@
-}
-
-
-
-
-
-
-
+
+
-  Element.setStyle(element, {fontSize: (percent/100) + 'em'});   
-  
+
-}
-
@@ -74 +70 @@
-       { filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'') +
-                 'alpha(opacity='+value*100+')' });  
-   
+
-}  
- 
@@ -92 +88 @@
-    element.appendChild(n);
-    element.removeChild(n);
-
-
+
+
+
+
+
+
+
+
+
-
-Array.prototype.call = function() {
@@ -149 +152 @@
-      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
-    }, arguments[2] || {});
-Element.visible(element
+element.visible(
-      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
-  }
@@ -353 +356 @@
-    // make this work on IE on elements without 'layout'
-    if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout))
-Element.setStyle(this.element, 
+this.element.setStyle(
-    var options = Object.extend({
-Element.getOpacity(this.element
+this.element.getOpacity(
-      to:   1.0
-    }, arguments[1] || {});
@@ -361 +364 @@
-  },
-  update: function(position) {
-Element.setOpacity(this.element, 
+this.element.setOpacity(
-  }
-});
@@ -381 +384 @@
-    // ==> Always set top and left for position relative elements in your stylesheets 
-    // (to 0 if you do not need them) 
-Element.makePositioned(this.element
-Element.getStyle(this.element,
-Element.getStyle(this.element,
+this.element.makePositioned(
+this.element.getStyle(
+this.element.getStyle(
-    if(this.options.mode == 'absolute') {
-      // absolute movement, so we need to calc deltaX and deltaY
@@ -391 +394 @@
-  },
-  update: function(position) {
-Element.setStyle(this.element, 
+this.element.setStyle(
-      left: this.options.x  * position + this.originalLeft + 'px',
-      top:  this.options.y  * position + this.originalTop  + 'px'
@@ -421 +424 @@
-  setup: function() {
-    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
-Element.getStyle(this.element,
+this.element.getStyle(
-    
-    this.originalStyle = {};
@@ -431 +434 @@
-    this.originalLeft = this.element.offsetLeft;
-    
-Element.