From 6acc3ff7909dd7f070973c112ebd9291862982f8 Mon Sep 17 00:00:00 2001 From: nikrou Date: Sat, 20 Feb 2010 19:56:36 +0000 Subject: Feature 1442 : update jquery * update jquery to 1.4.1 * update jquery ui to 1.7.2 git-svn-id: http://piwigo.org/svn/trunk@4918 68402e56-0260-453c-a942-63ccdbb3a9ee --- template-common/lib/ui/effects.fold.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'template-common/lib/ui/effects.fold.js') diff --git a/template-common/lib/ui/effects.fold.js b/template-common/lib/ui/effects.fold.js index 9fa1e661e..5ed1188f6 100644 --- a/template-common/lib/ui/effects.fold.js +++ b/template-common/lib/ui/effects.fold.js @@ -1,10 +1,10 @@ /* - * jQuery UI Effects Fold + * jQuery UI Effects Fold 1.7.2 * - * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com) + * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT (MIT-LICENSE.txt) * and GPL (GPL-LICENSE.txt) licenses. - * + * * http://docs.jquery.com/UI/Effects/Fold * * Depends: @@ -18,12 +18,13 @@ $.effects.fold = function(o) { // Create element var el = $(this), props = ['position','top','left']; - + // Set options var mode = $.effects.setMode(el, o.options.mode || 'hide'); // Set Mode var size = o.options.size || 15; // Default fold size var horizFirst = !(!o.options.horizFirst); // Ensure a boolean value - + var duration = o.duration ? o.duration / 2 : $.fx.speeds._default / 2; + // Adjust $.effects.save(el, props); el.show(); // Save & Show var wrapper = $.effects.createWrapper(el).css({overflow:'hidden'}); // Create Wrapper @@ -31,25 +32,25 @@ $.effects.fold = function(o) { var ref = widthFirst ? ['width', 'height'] : ['height', 'width']; var distance = widthFirst ? [wrapper.width(), wrapper.height()] : [wrapper.height(), wrapper.width()]; var percent = /([0-9]+)%/.exec(size); - if(percent) size = parseInt(percent[1]) / 100 * distance[mode == 'hide' ? 0 : 1]; + if(percent) size = parseInt(percent[1],10) / 100 * distance[mode == 'hide' ? 0 : 1]; if(mode == 'show') wrapper.css(horizFirst ? {height: 0, width: size} : {height: size, width: 0}); // Shift - + // Animation var animation1 = {}, animation2 = {}; animation1[ref[0]] = mode == 'show' ? distance[0] : size; animation2[ref[1]] = mode == 'show' ? distance[1] : 0; - + // Animate - wrapper.animate(animation1, o.duration / 2, o.options.easing) - .animate(animation2, o.duration / 2, o.options.easing, function() { + wrapper.animate(animation1, duration, o.options.easing) + .animate(animation2, duration, o.options.easing, function() { if(mode == 'hide') el.hide(); // Hide $.effects.restore(el, props); $.effects.removeWrapper(el); // Restore if(o.callback) o.callback.apply(el[0], arguments); // Callback el.dequeue(); }); - + }); - + }; })(jQuery); -- cgit v1.2.3