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

Changeset 4229

Show
Ignore:
Timestamp:
04/18/06 08:14:55 (2 years ago)
Author:
madrobby
Message:

Corrected options parsing on switchoff effect, fixes #4710 [thx haldini]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • spinoffs/scriptaculous/CHANGELOG

    r4193 r4229  
     1*SVN* 
     2 
     3* Corrected options parsing on switchoff effect, fixes #4710 [thx haldini] 
     4 
    15*V1.6.1* 
    26 

  • spinoffs/scriptaculous/src/effects.js

    r4128 r4229  
    590590  element = $(element); 
    591591  element.makeClipping(); 
    592   return new Effect.Scale(element, 0,  
     592  return new Effect.Scale(element, 0, 
    593593    Object.extend({ scaleContent: false,  
    594594      scaleX: false,  
    …… 
    605605  element = $(element); 
    606606  var elementDimensions = element.getDimensions(); 
    607   return new Effect.Scale(element, 100,  
    608     Object.extend({ scaleContent: false,  
    609       scaleX: false, 
    610       scaleFrom: 0, 
    611       scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, 
    612       restoreAfterFinish: true, 
    613       afterSetup: function(effect) { 
    614         effect.element.makeClipping(); 
    615         effect.element.setStyle({height: '0px'}); 
    616         effect.element.show();  
    617       },   
    618       afterFinishInternal: function(effect) { 
    619         effect.element.undoClipping(); 
    620       } 
    621     }, arguments[1] || {}) 
    622   ); 
     607  return new Effect.Scale(element, 100, $H({  
     608    scaleContent: false,  
     609    scaleX: false, 
     610    scaleFrom: 0, 
     611    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width}, 
     612    restoreAfterFinish: true, 
     613    afterSetup: function(effect) { 
     614      effect.element.makeClipping(); 
     615      effect.element.setStyle({height: '0px'}); 
     616      effect.element.show();  
     617    },   
     618    afterFinishInternal: function(effect) { 
     619      effect.element.undoClipping(); 
     620    } 
     621  }).merge(arguments[1] || {})); 
    623622} 
    624623 
    …… 
    626625  element = $(element); 
    627626  var oldOpacity = element.getInlineOpacity(); 
    628   return new Effect.Appear(element, {  
     627  return new Effect.Appear(element, $H({  
    629628    duration: 0.4, 
    630629    from: 0, 
    …… 
    646645      }) 
    647646    } 
    648   }); 
     647  }).merge(arguments[1] || {})); 
    649648} 
    650649 

  • spinoffs/scriptaculous/test/unit/effects_test.html

    r4101 r4229  
    212212    // test if all combined effects correctly initialize themselves 
    213213    testCombinedEffectsInitialize: function() { with(this) { 
    214       for (var j=0;j<COMBINED_EFFECTS.length;j++){ 
     214      COMBINED_EFFECTS.each(function(fx){ 
    215215        $('sandbox').innerHTML = ""; 
    216216        $('sandbox').appendChild( 
    …… 
    219219             
    220220        // should work with new Effect.Blah syntax 
    221         var effect = new Effect[COMBINED_EFFECTS[j]]('test_element'); 
     221        var effect = new Effect[fx]('test_element'); 
    222222        assertEqual(0, effect.currentFrame); 
    223223         
    224224        // and without the 'new' 
    225         var effect = Effect[COMBINED_EFFECTS[j]]('test_element'); 
     225        var effect = Effect[fx]('test_element'); 
    226226        assertEqual(0, effect.currentFrame); 
    227       } 
     227         
     228        // options parsing (shake, squish and grow are special here) 
     229        if(!['Shake','Squish','Grow'].include(fx)) { 
     230          var effect = Effect[fx]('test_element',{duration:2.0}); 
     231          assertEqual(2.0, effect.options.duration, fx); 
     232        } 
     233      }); 
    228234    }}, 
    229235