mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Merge pull request #6210 from owncloud/fix-5865" 

This reverts commit f12363d90b, reversing
changes made to eba35d28cd.
This commit is contained in:
Morris Jobke 2013-12-05 21:03:17 +01:00
parent 9c4bbf9ad7
commit ec0aa6bb65
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/js/multiselect.js
View File

@ -27,7 +27,6 @@
'onuncheck':false, 'onuncheck':false,
'minWidth': 'default;' 'minWidth': 'default;'
}; };
var slideDuration = 200;
$(this).attr('data-msid', multiSelectId); $(this).attr('data-msid', multiSelectId);
$.extend(settings,options); $.extend(settings,options);
$.each(this.children(),function(i,option) { $.each(this.children(),function(i,option) {
@ -69,12 +68,12 @@
var button=$(this); var button=$(this);
if(button.parent().children('ul').length>0) { if(button.parent().children('ul').length>0) {
if(self.menuDirection === 'down') { if(self.menuDirection === 'down') {
button.parent().children('ul').slideUp(slideDuration,function() { button.parent().children('ul').slideUp(400,function() {
button.parent().children('ul').remove(); button.parent().children('ul').remove();
button.removeClass('active down'); button.removeClass('active down');
}); });
} else { } else {
button.parent().children('ul').fadeOut(slideDuration,function() { button.parent().children('ul').fadeOut(400,function() {
button.parent().children('ul').remove(); button.parent().children('ul').remove();
button.removeClass('active up'); button.removeClass('active up');
}); });
@ -82,7 +81,7 @@
return; return;
} }
var lists=$('ul.multiselectoptions'); var lists=$('ul.multiselectoptions');
lists.slideUp(slideDuration,function(){ lists.slideUp(400,function(){
lists.remove(); lists.remove();
$('div.multiselect').removeClass('active'); $('div.multiselect').removeClass('active');
button.addClass('active'); button.addClass('active');
@ -277,7 +276,7 @@
}); });
list.addClass('down'); list.addClass('down');
button.addClass('down'); button.addClass('down');
list.slideDown(slideDuration); list.slideDown();
} else { } else {
list.css('max-height', $(document).height()-($(document).height()-(pos.top)+50)+'px'); list.css('max-height', $(document).height()-($(document).height()-(pos.top)+50)+'px');
list.css({ list.css({
@ -300,12 +299,12 @@
if(!button.parent().data('preventHide')) { if(!button.parent().data('preventHide')) {
// How can I save the effect in a var? // How can I save the effect in a var?
if(self.menuDirection === 'down') { if(self.menuDirection === 'down') {
button.parent().children('ul').slideUp(slideDuration,function() { button.parent().children('ul').slideUp(400,function() {
button.parent().children('ul').remove(); button.parent().children('ul').remove();
button.removeClass('active down'); button.removeClass('active down');
}); });
} else { } else {
button.parent().children('ul').fadeOut(slideDuration,function() { button.parent().children('ul').fadeOut(400,function() {
button.parent().children('ul').remove(); button.parent().children('ul').remove();
button.removeClass('active up'); button.removeClass('active up');
}); });