summaryrefslogtreecommitdiffstats
path: root/usr/local/www/javascript/scriptaculous/effects.js
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfSense.org>2009-12-23 19:10:40 -0500
committerScott Ullrich <sullrich@pfSense.org>2009-12-23 19:10:40 -0500
commit3bb547c2b391bf1e134ac9ee4ef98aca0fdbd1b6 (patch)
treeed0d77fb2d8f64f969a81914725ddf5b63e33a3d /usr/local/www/javascript/scriptaculous/effects.js
parent72d51890048043fce76c8e931298328dd8dd53a3 (diff)
downloadpfsense-3bb547c2b391bf1e134ac9ee4ef98aca0fdbd1b6.zip
pfsense-3bb547c2b391bf1e134ac9ee4ef98aca0fdbd1b6.tar.gz
Updating to 1.8.3
Diffstat (limited to 'usr/local/www/javascript/scriptaculous/effects.js')
-rw-r--r--usr/local/www/javascript/scriptaculous/effects.js21
1 files changed, 7 insertions, 14 deletions
diff --git a/usr/local/www/javascript/scriptaculous/effects.js b/usr/local/www/javascript/scriptaculous/effects.js
index f31a81a..066ee59 100644
--- a/usr/local/www/javascript/scriptaculous/effects.js
+++ b/usr/local/www/javascript/scriptaculous/effects.js
@@ -1,6 +1,6 @@
-// script.aculo.us effects.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+// script.aculo.us effects.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// 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/)
@@ -147,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 || {}));
}
};
@@ -230,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;
OpenPOWER on IntegriCloud