Changeset 3300

Timestamp:

12/13/05 18:41:10 (3 years ago)

Author:

madrobby

Message:

Update stable to scriptaculous 1.5 final

Files:

• branches/stable/actionpack/CHANGELOG (modified) (1 diff)
• branches/stable/actionpack/lib/action_view/helpers/javascripts/dragdrop.js (modified) (18 diffs)
• branches/stable/actionpack/lib/action_view/helpers/javascripts/effects.js (modified) (37 diffs)
• branches/stable/railties/CHANGELOG (modified) (1 diff)
• branches/stable/railties/html/javascripts/dragdrop.js (modified) (18 diffs)
• branches/stable/railties/html/javascripts/effects.js (modified) (37 diffs)

branches/stable/actionpack/CHANGELOG

@@ -1 +1 @@
-*1.1.2* (December 13th, 2005)
+
+* Update to script.aculo.us 1.5.0 final (equals 1.5.0_rc6) [Thomas Fuchs]
-
-* Update to Prototype 1.4.0 final [Sam Stephenson]

branches/stable/actionpack/lib/action_view/helpers/javascripts/dragdrop.js

@@ -9 +9 @@
-
-  remove: function(element) {
-element
+$(element)
-  },
-
@@ -44 +44 @@
-  },
-
-X, pY
+oint
-    return (
-      (drop.element!=element) &&
@@ -52 +52 @@
-        (Element.classNames(element).detect( 
-          function(v) { return drop.accept.include(v) } ) )) &&
-X, pY
+oint[0], point[1]
-  },
-
@@ -62 +62 @@
-
-  activate: function(drop) {
-    if(this.last_active) this.deactivate(this.last_active);
-    if(drop.hoverclass)
-      Element.addClassName(drop.element, drop.hoverclass);
@@ -68 +67 @@
-  },
-
-eve
+poi
-    if(!this.drops.length) return;
-
-
-
-
-
-
-
+
+
+
+
-        if(drop.onHover)
-           drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-        if(drop.greedy) { 
-thi
-return
+Droppable
+throw $break
-        }
-      }
-
-
-
+
-  },
-
@@ -93 +87 @@
-    Position.prepare();
-
-Event.pointerX(event), Event.pointerY(event)
+[Event.pointerX(event), Event.pointerY(event)]
-      if (this.last_active.onDrop) 
-        this.last_active.onDrop(element, this.last_active.element, event);
@@ -105 +99 @@
-
-var Draggables = {
+  drags: [],
-  observers: [],
+  
+  register: function(draggable) {
+    if(this.drags.length == 0) {
+      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
+      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+      
+      Event.observe(document, "mouseup", this.eventMouseUp);
+      Event.observe(document, "mousemove", this.eventMouseMove);
+      Event.observe(document, "keypress", this.eventKeypress);
+    }
+    this.drags.push(draggable);
+  },
+  
+  unregister: function(draggable) {
+    this.drags = this.drags.reject(function(d) { return d==draggable });
+    if(this.drags.length == 0) {
+      Event.stopObserving(document, "mouseup", this.eventMouseUp);
+      Event.stopObserving(document, "mousemove", this.eventMouseMove);
+      Event.stopObserving(document, "keypress", this.eventKeypress);
+    }
+  },
+  
+  activate: function(draggable) {
+    window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+    this.activeDraggable = draggable;
+  },
+  
+  deactivate: function(draggbale) {
+    this.activeDraggable = null;
+  },
+  
+  updateDrag: function(event) {
+    if(!this.activeDraggable) return;
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    // Mozilla-based browsers fire successive mousemove events with
+    // the same coordinates, prevent needless redrawing (moz bug?)
+    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
+    this._lastPointer = pointer;
+    this.activeDraggable.updateDrag(event, pointer);
+  },
+  
+  endDrag: function(event) {
+    if(!this.activeDraggable) return;
+    this._lastPointer = null;
+    this.activeDraggable.endDrag(event);
+  },
+  
+  keyPress: function(event) {
+    if(this.activeDraggable)
+      this.activeDraggable.keyPress(event);
+  },
+  
-  addObserver: function(observer) {
-    this.observers.push(observer);
-    this._cacheObserverCallbacks();
-  },
+  
-  removeObserver: function(element) {  // element instead of observer fixes mem leaks
-    this.observers = this.observers.reject( function(o) { return o.element==element });
-    this._cacheObserverCallbacks();
-  },
+  
-  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
-    if(this[eventName+'Count'] > 0)
@@ -120 +170 @@
-      });
-  },
+  
-  _cacheObserverCallbacks: function() {
-    ['onStart','onEnd','onDrag'].each( function(eventName) {
@@ -141 +192 @@
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-
+element._revert = 
-      },
-      endeffect: function(element) { 
- 
+
-      },
-      zindex: 1000,
-
+
+
-    }, arguments[1] || {});
-
-
+
+
-    if(options.handle && (typeof options.handle == 'string'))
-
-
+
-    if(!this.handle) this.handle = $(options.handle);
-    if(!this.handle) this.handle = this.element;
@@ -159 +211 @@
-    Element.makePositioned(this.element); // fix IE    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  destroy: function() {
-    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      // abort on form elements, fixes a Firefox issue
-      var src = Event.element(event);
@@ -210 +241 @@
-        src.tagName=='BUTTON' ||
-        src.tagName=='TEXTAREA')) return;
+        
+      if(this.element._revert) {
+        this.element._revert.cancel();
+        this.element._revert = null;
+      }
-      
-      // this.registerEvents();
-      this.active = true;
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-
-
-
+
+
+
+
-      Event.stop(event);
-    }
-  },
+  
+  startDrag: function(event) {
+    this.dragging = true;
+    
+    if(this.options.zindex) {
+      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+      this.element.style.zIndex = this.options.zindex;
+    }
+    
+    if(this.options.ghosting) {
+      this._clone = this.element.cloneNode(true);
+      Position.absolutize(this.element);
+      this.element.parentNode.insertBefore(this._clone, this.element);
+    }
+    
+    Draggables.notify('onStart', this, event);
+    if(this.options.starteffect) this.options.starteffect(this.element);
+  },
+  
+  updateDrag: function(event, pointer) {
+    if(!this.dragging) this.startDrag(event);
+    Position.prepare();
+    Droppables.show(pointer, this.element);
+    Draggables.notify('onDrag', this, event);
+    this.draw(pointer);
+    if(this.options.change) this.options.change(this);
+    
+    // fix AppleWebKit rendering
+    if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+    Event.stop(event);
+  },
+  
-  finishDrag: function(event, success) {
-    // this.unregisterEvents();
-
-    this.active = false;
-    this.dragging = false;
-
@@ -237 +301 @@
-    var revert = this.options.revert;
-    if(revert && typeof revert == 'function') revert = revert(this.element);
-
+
+
-    if(revert && this.options.reverteffect) {
-      this.options.reverteffect(this.element, 
-
-
+
-    } else {
-
-
+
-    }
-
@@ -253 +316 @@
-      this.options.endeffect(this.element);
-
-
+
-    Droppables.reset();
-  },
+  
-  keyPress: function(event) {
-
-
-
-
-
-
-
+
+
+
+
+
-  endDrag: function(event) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    var style = this.element.style;
-    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
-(pointer[0] - offsets[0] - this.offsetX)
+p[0]
-    if((!this.options.constraint) || (this.options.constraint=='vertical'))
-(pointer[1] - offsets[1] - this.offsetY)
+p[1]
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
-  },
-  update: function(event) {
-   if(this.active) {
-      if(!this.dragging) {
-        var style = this.element.style;
-        this.dragging = true;
-        
-        if(Element.getStyle(this.element,'position')=='') 
-          style.position = "relative";
-        
-        if(this.options.zindex) {
-          this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
-          style.zIndex = this.options.zindex;
-        }
-
-        if(this.options.ghosting) {
-          this._clone = this.element.cloneNode(true);
-          Position.absolutize(this.element);
-          this.element.parentNode.insertBefore(this._clone, this.element);
-        }
-
-        Draggables.notify('onStart', this, event);
-        if(this.options.starteffect) this.options.starteffect(this.element);
-      }
-
-      Droppables.show(event, this.element);
-      Draggables.notify('onDrag', this, event);
-      this.draw(event);
-      if(this.options.change) this.options.change(this);
-
-      // fix AppleWebKit rendering
-      if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0); 
-
-      Event.stop(event);
-   }
-  }
-}
@@ -330 +370 @@
-    this.lastValue = Sortable.serialize(this.element);
-  },
+  
-  onStart: function() {
-    this.lastValue = Sortable.serialize(this.element);
-  },
+  
-  onEnd: function() {
-    Sortable.unmark();
@@ -342 +384 @@
-var Sortable = {
-  sortables: new Array(),
+  
-  options: function(element){
-    element = $(element);
-    return this.sortables.detect(function(s) { return s.element == element });
-  },
+  
-  destroy: function(element){
-    element = $(element);
@@ -355 +399 @@
-    this.sortables = this.sortables.reject(function(s) { return s.element == element });
-  },
+  
-  create: function(element) {
-    element = $(element);
@@ -448 +493 @@
-    var elements = [];
-    $A(element.childNodes).each( function(e) {
-
+.toUpperCase()
-        (!options.only || (Element.hasClassName(e, options.only))))
-          elements.push(e);
@@ -532 +577 @@
-      format: sortableOptions.format || /^[^_]*_(.*)$/
-    }, arguments[1] || {});
-collect
+map
-      return (encodeURIComponent(options.name) + "[]=" + 
-              encodeURIComponent(item.id.match(options.format) ? item.id.match(options.format)[1] : ''));

branches/stable/actionpack/lib/action_view/helpers/javascripts/effects.js

@@ -12 +12 @@
-// returns self (or first argument) if not convertable  
-String.prototype.parseColor = function() {  
-color = "#"
-"rgb("
+var color = '#'
+'rgb('
-    var cols = this.slice(4,this.length-1).split(',');  
-    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
@@ -27 +27 @@
-Element.collectTextNodesIgnoreClass = function(element, ignoreclass) {  
-  var children = $(element).childNodes;  
-""
-"^([^ ]+ )*" + ignoreclass+ "( [^ ]+)*$","i"
+''
+'^([^ ]+ )*' + ignoreclass+ '( [^ ]+)*$','i'
- 
-  for (var i = 0; i < children.length; i++) {  
@@ -42 +42 @@
-}
-
+Element.setStyle = function(element, style) {
+  element = $(element);
+  for(k in style) element.style[k.camelize()] = style[k];
+}
+
-Element.setContentZoom = function(element, percent) {  
-
-
+
-  if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);  
-}
-
-Element.getOpacity = function(element){  
-  
-"opacity"
+
+'opacity'
-    return parseFloat(opacity);  
-"filter"
+'filter'
-    if(opacity[1]) return parseFloat(opacity[1]) / 100;  
-  return 1.0;  
@@ -59 +63 @@
-Element.setOpacity = function(element, value){  
-  element= $(element);  
-
-
-
+
+
+
+
-    if(/MSIE/.test(navigator.userAgent))  
-els.filter = Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,''
+Element.setStyle(element, {filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'')}
-  } else {  
-    if(value < 0.00001) value = 0;  
-els.opacity = value;  
+Element.setStyle(element, {opacity: value});
-    if(/MSIE/.test(navigator.userAgent))  
-
-
+
+
+
-  }   
-}  
- 
-Element.getInlineOpacity = function(element){  
-
-
-
-
-
+
-}  
-
-
-
-
-
-
-
+
-Element.childrenWithClassName = function(element, className) {  
-  return $A($(element).getElementsByTagName('*')).select(
-    function(c) { return Element.hasClassName(c, className) });
-
-
+
+
+
+
+
+
+
-/*--------------------------------------------------------------------------*/
-
-var Effect = {
-  tagifyText: function(element) {
-"position:relative"
-";zoom:1"
+'position:relative'
+';zoom:1'
-    element = $(element);
-    $A(element.childNodes).each( function(child) {
@@ -104 +105 @@
-          element.insertBefore(
-            Builder.node('span',{style: tagifyStyle},
-" "
+' '
-              child);
-        });
@@ -124 +125 @@
-      delay: 0.0
-    }, arguments[2] || {});
-
-
+
-
-    $A(elements).each( function(element, index) {
-delay + index * speed
+index * options.speed + masterDelay
-    });
-  }
@@ -259 +259 @@
-      this.event('afterSetup');
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  },
-  cancel: function() {
@@ -274 +276 @@
-    if(this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
-    if(this.options[eventName]) this.options[eventName](this);
+  },
+  inspect: function() {
+    return '#<Effect:' + $H(this).inspect() + ',options:' + $H(this.options).inspect() + '>';
-  }
-}
@@ -303 +308 @@
-    // make this work on IE on elements without 'layout'
-    if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout))
-this.element.style.zoom = 1
+Element.setStyle(this.element, {zoom: 1})
-    var options = Object.extend({
-      from: Element.getOpacity(this.element) || 0.0,
@@ -327 +332 @@
-    // relative element that does not have top/left explicitly set.
-    // ==> Always set top and left for position relative elements in your stylesheets 
-
-
+
-    Element.makePositioned(this.element);
-    this.originalTop  = parseFloat(Element.getStyle(this.element,'top')  || '0');
@@ -334 +338 @@
-  },
-  update: function(position) {
-
-
-
-
-
-
-
+
+
+
+
-  }
-});
@@ -360 +361 @@
-  },
-  setup: function() {
-    var effect = this;
-    
-    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
-    this.elementPositioning = Element.getStyle(this.element,'position');
-    
-effect
+this
-    ['top','left','width','height','fontSize'].each( function(k) {
-effect.originalStyle[k] = effect
-
+this.originalStyle[k] = this
+.bind(this)
-      
-    this.originalTop  = this.element.offsetTop;
-    this.originalLeft = this.element.offsetLeft;
-    
-"100%"
+'100%'
-    ['em','px','%'].each( function(fontSizeType) {
-      if(fontSize.indexOf(fontSizeType)>0) {
-effect
-effect
+this
+this
-      }
-
+.bind(this)
-    
-    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
@@ -385 +384 @@
-    this.dims = null;
-    if(this.options.scaleMode=='box')
-clientHeight, this.element.clien
-this.options.scaleMode=='content'
+offsetHeight, this.element.offse
+/^content/.test(this.options.scaleMode)
-      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
-    if(!this.dims)
@@ -395 +394 @@
-    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
-    if(this.options.scaleContent && this.fontSize)
-this.element.style.fontSize = this.fontSize*currentScale + this.fontSizeType
+Element.setStyle(this.element, {fontSize: this.fontSize * currentScale + this.fontSizeType })
-    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
-  },
-  finish: function(position) {
-
-
-
-
-
-
+
-  },
-  setDimensions: function(height, width) {
-els = this.element.style
-els
-els
+d = {}
+d
+d
-    if(this.options.scaleFromCenter) {
-      var topd  = (height - this.dims[0])/2;
-      var leftd = (width  - this.dims[1])/2;
-      if(this.elementPositioning == 'absolute') {
-els.top = this.originalTop-topd + "px"
-els.left = this.originalLeft-leftd + "px"
+d.top = this.originalTop-topd + 'px'
+d.left = this.originalLeft-leftd + 'px'
-      } else {
-els.top = -topd + "px"
-els.left = -leftd + "px"
+d.top = -topd + 'px'
+d.left = -leftd + 'px'
-      }
-    }
+    Element.setStyle(this.element, d);
-  }
-});
@@ -428 +423 @@
-  initialize: function(element) {
-    this.element = $(element);
-
-
-
+
-    this.start(options);
-  },
-  setup: function() {
-    // Prevent executing on elements not in the layout flow
-this.element.style.display
+Element.getStyle(this.element, 'display')
-    // Disable background image during the effect
-
-
+
+
+
-    if(!this.options.endcolor)
-      this.options.endcolor = Element.getStyle(this.element, 'background-color').parseColor('#ffffff');
- (typeof this.options.restorecolor == "undefined"
-this.element.style.backgroundColor
+(!this.options.restorecolor
+Element.getStyle(this.element, 'background-color')
-    // init color calculations
-
-
-
-
-
-
-
-
+
+
-  },
-  update: function(position) {
-
-
-
-
-
+
+
-  },
-  finish: function() {
-
-
+
+
+
-  }
-});
@@ -475 +461 @@
-    Position.prepare();
-    var offsets = Position.cumulativeOffset(this.element);
+    if(this.options.offset) offsets[1] += this.options.offset;
-    var max = window.innerHeight ? 
-      window.height - window.innerHeight :
@@ -497 +484 @@
-  from: Element.getOpacity(element) || 1.0,
-  to:   0.0,
-
-
-
-
-
-
+
+
+
+
-  }, arguments[1] || {});
-  return new Effect.Opacity(element,options);
@@ -509 +494 @@
-Effect.Appear = function(element) {
-  var options = Object.extend({
-"display") == "none"
+'display') == 'none'
-  to:   1.0,
- 
-{ Element.
-  Element.show(effect.element); 
+{ with(Element) {
+
+show(effect.element); }
-  }, arguments[1] || {});
-  return new Effect.Opacity(element,options);
@@ -520 +505 @@
-Effect.Puff = function(element) {
-  element = $(element);
-
-
+
-  return new Effect.Parallel(
-   [ new Effect.Scale(element, 200, 
@@ -527 +511 @@
-     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], 
-     Object.extend({ duration: 1.0, 
-
-
-
-
-
-
+
+
+
+
+
-     }, arguments[1] || {})
-   );
@@ -544 +527 @@
-      scaleX: false, 
-      restoreAfterFinish: true,
-
-
-
-
-
+
+
-    }, arguments[1] || {})
-  );
@@ -555 +535 @@
-Effect.BlindDown = function(element) {
-  element = $(element);
-element.style.height
+Element.getStyle(element, 'height')
-  var elementDimensions = Element.getDimensions(element);
-  return new Effect.Scale(element, 100, 
@@ -563 +543 @@
-      scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-      restoreAfterFinish: true,
-
-Element.
-effect.element.style.height = "0px"
-Element.
-
-
-Element.
-effect.element.style.height = oldHeight
-
+ with(Element) {
+
+setStyle(effect.element, {height: '0px'})
+
+}
+ with(Element) {
+
+setStyle(effect.element, {height: oldHeight})
+}
-    }, arguments[1] || {})
-  );
@@ -587 +567 @@
-        duration: 0.3, scaleFromCenter: true,
-        scaleX: false, scaleContent: false, restoreAfterFinish: true,
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-      })
-    }
@@ -604 +581 @@
-Effect.DropOut = function(element) {
-  element = $(element);
-
-
-
+
+
+
+
-  return new Effect.Parallel(
-    [ new Effect.MoveBy(element, 100, 0, { sync: true }), 
@@ -612 +590 @@
-    Object.extend(
-      { duration: 0.5,
-
-
-
-
-
-
-
-
+
+
+
+
+
-      }, arguments[1] || {}));
-}
@@ -625 +600 @@
-Effect.Shake = function(element) {
-  element = $(element);
-
-
+
+
+
-  return new Effect.MoveBy(element, 0, 20, 
-    { duration: 0.05, afterFinishInternal: function(effect) {
@@ -638 +614 @@
-    { duration: 0.1, afterFinishInternal: function(effect) {
-  new Effect.MoveBy(effect.element, 0, -20, 
-
-
-
-
-
+
+
+
+
-}
-
@@ -649 +624 @@
-  Element.cleanWhitespace(element);
-  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-element.firstChild.style.bottom
+Element.getStyle(element.firstChild, 'bottom')
-  var elementDimensions = Element.getDimensions(element);
-
-Object.extend({
+Object.extend({ 
+
-    scaleX: false, 
-    scaleFrom: 0,
-    
+
-    restoreAfterFinish: true,
-
-
-
-
-
-