diff --git a/jquery.cycle.all.js b/jquery.cycle.all.js index dc474ea..f1c0f74 100644 --- a/jquery.cycle.all.js +++ b/jquery.cycle.all.js @@ -226,7 +226,10 @@ function buildOptions($cont, $slides, els, options, o) { var startingSlideSpecified; // support metadata plugin (v1.0 and v2.0) var opts = $.extend({}, $.fn.cycle.defaults, options || {}, $.metadata ? $cont.metadata() : $.meta ? $cont.data() : {}); - var meta = $.isFunction($cont.data) ? $cont.data(opts.metaAttr) : null; + var meta = null; + if (typeof $cont.data(opts.metaAttr) === 'function') { + meta = $cont.data(opts.metaAttr) + } if (meta) opts = $.extend(opts, meta); if (opts.autostop) @@ -464,7 +467,7 @@ function buildOptions($cont, $slides, els, options, o) { // run transition init fn if (!opts.multiFx) { var init = $.fn.cycle.transitions[opts.fx]; - if ($.isFunction(init)) + if (typeof init == 'function') init($cont, $slides, opts); else if (opts.fx != 'custom' && !opts.multiFx) { log('unknown transition: ' + opts.fx,'; slideshow terminating'); @@ -609,7 +612,7 @@ $.fn.cycle.resetState = function(opts, fx) { // re-init var init = $.fn.cycle.transitions[fx]; - if ($.isFunction(init)) + if (typeof init == 'function') init(opts.$cont, $(opts.elements), opts); }; @@ -700,7 +703,7 @@ function go(els, opts, manual, fwd) { opts.busy = 1; if (opts.fxFn) // fx function provided? opts.fxFn(curr, next, opts, after, fwd, manual && opts.fastOnEvent); - else if ($.isFunction($.fn.cycle[opts.fx])) // fx plugin ? + else if (typeof $.fn.cycle[opts.fx] == 'function') $.fn.cycle[opts.fx](curr, next, opts, after, fwd, manual && opts.fastOnEvent); else $.fn.cycle.custom(curr, next, opts, after, fwd, manual && opts.fastOnEvent); @@ -825,7 +828,7 @@ function advance(opts, moveForward) { } var cb = opts.onPrevNextEvent || opts.prevNextClick; // prevNextClick is deprecated - if ($.isFunction(cb)) + if (typeof cb == 'function') cb(val > 0, opts.nextSlide, els[opts.nextSlide]); go(els, opts, 1, moveForward); return false;