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

27
core/js/multiselect.js
View File

@ -8,7 +8,7 @@
* @param 'labels' The corresponding labels to show for the checked items. * @param 'labels' The corresponding labels to show for the checked items.
* @param 'oncheck' Callback function which will be called when a checkbox/radiobutton is selected. If the function returns false the input will be unchecked. * @param 'oncheck' Callback function which will be called when a checkbox/radiobutton is selected. If the function returns false the input will be unchecked.
* @param 'onuncheck' @see 'oncheck'. * @param 'onuncheck' @see 'oncheck'.
* @param 'singleSelect' If true radiobuttons will be used instead of checkboxes. * @param 'singleSelect' If true radiobuttons will be used instead of checkboxes.
*/ */
(function( $ ){ (function( $ ){
var multiSelectId=-1; var multiSelectId=-1;
@ -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) {
@ -65,16 +64,16 @@
var self = this; var self = this;
self.menuDirection = 'down'; self.menuDirection = 'down';
button.click(function(event){ button.click(function(event){
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');
@ -151,7 +150,7 @@
settings.labels.splice(index,1); settings.labels.splice(index,1);
} }
var oldWidth=button.width(); var oldWidth=button.width();
button.children('span').first().text(settings.labels.length > 0 button.children('span').first().text(settings.labels.length > 0
? settings.labels.join(', ') ? settings.labels.join(', ')
: settings.title); : settings.title);
var newOuterWidth=Math.max((button.outerWidth()-2),settings.minOuterWidth)+'px'; var newOuterWidth=Math.max((button.outerWidth()-2),settings.minOuterWidth)+'px';
@ -222,7 +221,7 @@
select.append(option); select.append(option);
li.prev().children('input').prop('checked', true).trigger('change'); li.prev().children('input').prop('checked', true).trigger('change');
button.parent().data('preventHide',false); button.parent().data('preventHide',false);
button.children('span').first().text(settings.labels.length > 0 button.children('span').first().text(settings.labels.length > 0
? settings.labels.join(', ') ? settings.labels.join(', ')
: settings.title); : settings.title);
if(self.menuDirection === 'up') { if(self.menuDirection === 'up') {
@ -243,7 +242,7 @@
}); });
list.append(li); list.append(li);
} }
var doSort = function(list, selector) { var doSort = function(list, selector) {
var rows = list.find('li'+selector).get(); var rows = list.find('li'+selector).get();
@ -277,14 +276,14 @@
}); });
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({
top:pos.top - list.height(), top:pos.top - list.height(),
left:pos.left+3, left:pos.left+3,
width:(button.outerWidth()-2)+'px' width:(button.outerWidth()-2)+'px'
}); });
list.detach().insertBefore($(this)); list.detach().insertBefore($(this));
list.addClass('up'); list.addClass('up');
@ -300,19 +299,19 @@
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');
}); });
} }
} }
}); });
return span; return span;
}; };
})( jQuery ); })( jQuery );