Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7642

Show
Ignore:
Timestamp:
09/26/07 20:10:40 (2 years ago)
Author:
madrobby
Message:

script.aculo.us: Fix bottom CSS property reassignment and initialization in queues for Effect#SlideUp. Closes #7412, #7761.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • spinoffs/scriptaculous/CHANGELOG

    r7350 r7642  
    11*SVN* 
     2 
     3* Fix bottom CSS property reassignment and initialization in queues for Effect#SlideUp.  Closes #7412, #7761. 
    24 
    35* Fix an issue with String#parseStyle that could sometimes cause errors on Safari 2. 
  • spinoffs/scriptaculous/src/effects.js

    r7351 r7642  
    707707  element = $(element).cleanWhitespace(); 
    708708  var oldInnerBottom = element.down().getStyle('bottom'); 
     709  var elementDimensions = element.getDimensions(); 
    709710  return new Effect.Scale(element, window.opera ? 0 : 1, 
    710711   Object.extend({ scaleContent: false,  
     
    712713    scaleMode: 'box', 
    713714    scaleFrom: 100, 
     715    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, 
    714716    restoreAfterFinish: true, 
    715     beforeStartInternal: function(effect) { 
     717    afterSetup: function(effect) { 
    716718      effect.element.makePositioned(); 
    717719      effect.element.down().makePositioned(); 
     
    724726    }, 
    725727    afterFinishInternal: function(effect) { 
    726       effect.element.hide().undoClipping().undoPositioned().setStyle({bottom: oldInnerBottom})
    727       effect.element.down().undoPositioned()
     728      effect.element.hide().undoClipping().undoPositioned()
     729      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom})
    728730    } 
    729731   }, arguments[1] || { })