diff options
author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-08 18:57:00 +1100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-02-08 09:42:40 +0100 |
commit | 17b451898c09f560cef105ea120d8e767256555a (patch) | |
tree | fa03e0f1c864a266c32a7da50f7537d27ebeb363 /railties/lib/generators/rails/app/templates/public/javascripts/effects.js | |
parent | 5fe3dc4bf52eb315310a714c0fc1f627d47428fa (diff) | |
download | rails-17b451898c09f560cef105ea120d8e767256555a.tar.gz rails-17b451898c09f560cef105ea120d8e767256555a.tar.bz2 rails-17b451898c09f560cef105ea120d8e767256555a.zip |
Updating Prototype to 1.6.1 and script.aculo.us to 1.8.3
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib/generators/rails/app/templates/public/javascripts/effects.js')
-rw-r--r-- | railties/lib/generators/rails/app/templates/public/javascripts/effects.js | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/railties/lib/generators/rails/app/templates/public/javascripts/effects.js b/railties/lib/generators/rails/app/templates/public/javascripts/effects.js index 5a639d2dea..066ee5909c 100644 --- a/railties/lib/generators/rails/app/templates/public/javascripts/effects.js +++ b/railties/lib/generators/rails/app/templates/public/javascripts/effects.js @@ -1,4 +1,6 @@ -// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009 + +// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // Contributors: // Justin Palmer (http://encytemedia.com/) // Mark Pilgrim (http://diveintomark.org/) @@ -145,14 +147,13 @@ var Effect = { 'blind': ['BlindDown','BlindUp'], 'appear': ['Appear','Fade'] }, - toggle: function(element, effect) { + toggle: function(element, effect, options) { element = $(element); - effect = (effect || 'appear').toLowerCase(); - var options = Object.extend({ + effect = (effect || 'appear').toLowerCase(); + + return Effect[ Effect.PAIRS[ effect ][ element.visible() ? 1 : 0 ] ](element, Object.extend({ queue: { position:'end', scope:(element.id || 'global'), limit: 1 } - }, arguments[2] || { }); - Effect[element.visible() ? - Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options); + }, options || {})); } }; @@ -228,12 +229,6 @@ Effect.Queue = Effect.Queues.get('global'); Effect.Base = Class.create({ position: null, start: function(options) { - function codeForEvent(options,eventName){ - return ( - (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') + - (options[eventName] ? 'this.options.'+eventName+'(this);' : '') - ); - } if (options && options.transition === false) options.transition = Effect.Transitions.linear; this.options = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { }); this.currentFrame = 0; |