diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-12-06 18:27:46 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-12-06 18:27:46 +0100 |
| commit | 9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc (patch) | |
| tree | 082f05cc105e5540c6ef642d9b3d6daaa64fd749 /core/js | |
| parent | e888bdda30589d4d8c20bca3c1f962436794bf10 (diff) | |
| parent | b5939324b0053b6447423ebc8b269e9f773f7f02 (diff) | |
| download | nextcloud-server-9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc.tar.gz nextcloud-server-9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc.zip | |
Merge branch 'master' into backgroundscan-reuse-etag
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/multiselect.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 2210df3bc7a..02699636a20 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -27,6 +27,7 @@ 'onuncheck':false, 'minWidth': 'default;' }; + var slideDuration = 200; $(this).attr('data-msid', multiSelectId); $.extend(settings,options); $.each(this.children(),function(i,option) { @@ -68,12 +69,12 @@ var button=$(this); if(button.parent().children('ul').length>0) { if(self.menuDirection === 'down') { - button.parent().children('ul').slideUp(400,function() { + button.parent().children('ul').slideUp(slideDuration,function() { button.parent().children('ul').remove(); button.removeClass('active down'); }); } else { - button.parent().children('ul').fadeOut(400,function() { + button.parent().children('ul').fadeOut(slideDuration,function() { button.parent().children('ul').remove(); button.removeClass('active up'); }); @@ -81,7 +82,7 @@ return; } var lists=$('ul.multiselectoptions'); - lists.slideUp(400,function(){ + lists.slideUp(slideDuration,function(){ lists.remove(); $('div.multiselect').removeClass('active'); button.addClass('active'); @@ -276,7 +277,7 @@ }); list.addClass('down'); button.addClass('down'); - list.slideDown(); + list.slideDown(slideDuration); } else { list.css('max-height', $(document).height()-($(document).height()-(pos.top)+50)+'px'); list.css({ @@ -299,12 +300,12 @@ if(!button.parent().data('preventHide')) { // How can I save the effect in a var? if(self.menuDirection === 'down') { - button.parent().children('ul').slideUp(400,function() { + button.parent().children('ul').slideUp(slideDuration,function() { button.parent().children('ul').remove(); button.removeClass('active down'); }); } else { - button.parent().children('ul').fadeOut(400,function() { + button.parent().children('ul').fadeOut(slideDuration,function() { button.parent().children('ul').remove(); button.removeClass('active up'); }); |