[Jifty-commit] r5678 - in jifty/trunk: share/web/static/js
Jifty commits
jifty-commit at lists.jifty.org
Fri Aug 8 18:35:55 EDT 2008
Author: trs
Date: Fri Aug 8 18:35:55 2008
New Revision: 5678
Modified:
jifty/trunk/ (props changed)
jifty/trunk/share/web/static/js/jifty.js
Log:
r38850 at zot: tom | 2008-08-08 18:35:13 -0400
Revert cleanups that seem to be broken. (Not bothering to figure out why now.)
Modified: jifty/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js (original)
+++ jifty/trunk/share/web/static/js/jifty.js Fri Aug 8 18:35:55 2008
@@ -1061,15 +1061,18 @@
// Also, set us up the effect
if (f['effect']) {
- if(f['is_new'])
- jQuery(Jifty.$('region-'+f['region'])).hide();
Jifty.Effect(
Jifty.$('region-'+f['region']),
f['effect'],
- f['effect_args']
+ f['effect_args'],
+ {
+ before: function() {
+ if(f['is_new'])
+ jQuery(this).hide();
+ }
+ }
);
}
- return Jifty.$('region-'+f['region']);
}
// Update a region. Takes a hash of named parameters, including:
@@ -1636,14 +1639,15 @@
name == 'SlideUp' ? 'slideUp' :
name;
- if ( jQuery.isFunction(options["before"]) )
- options["before"].call( el );
+ if (jQuery.isFunction( jQuery(el)[ effect ] ) ) {
+ if ( jQuery.isFunction(options["before"]) )
+ options["before"].call( el );
- if ( jQuery.isFunction( jQuery(el)[ effect ] ) )
( jQuery(el)[ effect ] )(args);
- if ( jQuery.isFunction(options["after"]) )
- options["after"].call( el );
+ if ( jQuery.isFunction(options["after"]) )
+ options["after"].call( el );
+ }
};
/*
More information about the Jifty-commit
mailing list