From a8dafc2ff8259adb18a98c263dc1473aa24e454c Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Thu, 15 Nov 2018 14:08:13 +0100 Subject: Remove conflicting multiselect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/encryption/templates/settings-admin.php | 1 - apps/encryption/templates/settings-personal.php | 1 - core/css/multiselect.scss | 132 --------- core/css/server.scss | 1 - core/js/multiselect.js | 344 ------------------------ settings/templates/settings/frame.php | 2 +- 6 files changed, 1 insertion(+), 480 deletions(-) delete mode 100644 core/css/multiselect.scss delete mode 100644 core/js/multiselect.js diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php index c5f8d9f5536..39d10490c44 100644 --- a/apps/encryption/templates/settings-admin.php +++ b/apps/encryption/templates/settings-admin.php @@ -2,7 +2,6 @@ /** @var array $_ */ /** @var \OCP\IL10N $l */ script('encryption', 'settings-admin'); -script('core', 'multiselect'); style('encryption', 'settings-admin'); ?>
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php index 05a720687aa..41dacc534e6 100644 --- a/apps/encryption/templates/settings-personal.php +++ b/apps/encryption/templates/settings-personal.php @@ -2,7 +2,6 @@ /** @var array $_ */ /** @var \OCP\IL10N $l */ script('encryption', 'settings-personal'); -script('core', 'multiselect'); ?>

t('Basic encryption module')); ?>

diff --git a/core/css/multiselect.scss b/core/css/multiselect.scss deleted file mode 100644 index 6df137cc0f9..00000000000 --- a/core/css/multiselect.scss +++ /dev/null @@ -1,132 +0,0 @@ -/** - * @copyright Copyright (c) 2016, John Molakvoæ - * @copyright Copyright (c) 2016, Julius Haertl - * @copyright Copyright (c) 2016, Sergio Bertolín - * @copyright Copyright (c) 2015, Hendrik Leppelsack - * @copyright Copyright (c) 2014, Vincent Petry - * @copyright Copyright (c) 2013, Vincent Petry - * @copyright Copyright (c) 2013, raghunayyar - * @copyright Copyright (c) 2013, Victor Dubiniuk - * @copyright Copyright (c) 2013, kondou - * @copyright Copyright (c) 2012, Thomas Tanghus - * @copyright Copyright (c) 2012, Lukas Reschke - * @copyright Copyright (c) 2012, Jan-Christoph Borchardt - * - * @license GNU AGPL version 3 or any later version - * - */ - -ul.multiselectoptions { - background-color: var(--color-main-background); - border: 1px solid var(--color-primary); - border-top: none; - box-shadow: 0 1px 10px var(--color-box-shadow); - padding-top: 8px; - position: absolute; - max-height: 20em; - overflow-y: auto; - z-index: 149; - &.down { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - width: 100%; - /* do not cut off group names */ - box-shadow: 0 1px 10px var(--color-box-shadow); - } - &.up { - border-top-left-radius: 3px; - border-top-right-radius: 3px; - } - > li { - overflow: hidden; - white-space: nowrap; - margin-left: 7px; - input[type='checkbox'] { - + label { - font-weight: normal; - display: inline-block; - width: 100%; - padding: 5px 27px; - margin-left: -27px; - /* to have area around checkbox clickable as well */ - text-overflow: ellipsis; - overflow: hidden; - } - &:checked + label { - font-weight: bold; - } - } - } - input.new { - padding-bottom: 3px; - padding-top: 3px; - margin: 0; - } - > li.creator { - padding: 10px; - margin: 0; - font-weight: bold; - > input { - width: 95% !important; - /* do not constrain size of text input */ - padding: 5px; - margin: -5px; - } - } -} - -/* TODO drop old legacy multiselect! */ -div.multiselect:not(.multiselect-vue), -select.multiselect:not(.multiselect-vue) { - display: inline-block; - max-width: 200px; - min-width: 150px !important; - padding-right: 10px; - min-height: 20px; - position: relative; - vertical-align: bottom; -} - -select.multiselect { - height: 30px; - min-width: 113px; -} - -/* To make a select look like a multiselect until it's initialized */ -div.multiselect { - &.active { - background-color: var(--color-main-background); - position: relative; - z-index: 150; - } - &.up { - border-top: 0 none; - border-top-left-radius: 0; - border-top-right-radius: 0; - } - &.down { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } - > span { - &:first-child { - float: left; - margin-right: 32px; - overflow: hidden; - text-overflow: ellipsis; - width: 90%; - white-space: nowrap; - line-height: 20px; - } - &:last-child { - position: absolute; - right: 8px; - top: 8px; - padding: 0 !important; - min-width: 16px; - min-height: 16px; - background-position: center; - } - } -} diff --git a/core/css/server.scss b/core/css/server.scss index 9b512038015..7269847ad91 100644 --- a/core/css/server.scss +++ b/core/css/server.scss @@ -6,7 +6,6 @@ @import 'apps.scss'; @import 'global.scss'; @import 'fixes.scss'; -@import 'multiselect.scss'; @import 'mobile.scss'; @import 'tooltip.scss'; @import 'public.scss'; \ No newline at end of file diff --git a/core/js/multiselect.js b/core/js/multiselect.js deleted file mode 100644 index bdf420a2f7f..00000000000 --- a/core/js/multiselect.js +++ /dev/null @@ -1,344 +0,0 @@ -/** - * @param 'createCallback' A function to be called when a new entry is created. - * Two arguments are supplied to this function: - * The select element used and the value of the option. If the function - * returns false addition will be cancelled. If it returns - * anything else it will be used as the value of the newly added option. - * @param 'createText' The placeholder text for the create action. - * @param 'title' The title to show if no options are selected. - * @param 'checked' An array containing values for options that should be - * checked. Any options which are already selected will be added to this array. - * @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 'onuncheck' @see 'oncheck'. - * @param 'singleSelect' If true radiobuttons will be used instead of - * checkboxes. - */ -(function( $ ){ - var multiSelectId=-1; - $.fn.multiSelect=function(options) { - multiSelectId++; - var settings = { - 'createCallback':false, - 'createText':false, - 'singleSelect':false, - 'selectedFirst':false, - 'sort':true, - 'title':this.attr('title'), - 'checked':[], - 'labels':[], - 'oncheck':false, - 'onuncheck':false, - 'minWidth': 'default;' - }; - var slideDuration = 0; - $(this).attr('data-msid', multiSelectId); - $.extend(settings,options); - $.each(this.children(),function(i,option) { - // If the option is selected, but not in the checked array, add it. - if ( - $(option).attr('selected') && - settings.checked.indexOf($(option).val()) === -1 - ) { - settings.checked.push($(option).val()); - settings.labels.push($(option).text().trim()); - } - // If the option is in the checked array but not selected, select it. - else if ( - settings.checked.indexOf($(option).val()) !== -1 && - !$(option).attr('selected') - ) { - $(option).attr('selected', 'selected'); - settings.labels.push($(option).text().trim()); - } - }); - var button=$('
'+settings.title+'
'); - var span=$(''); - span.append(button); - button.data('id',multiSelectId); - button.selectedItems=[]; - this.hide(); - this.before(span); - if(settings.minWidth=='default') { - settings.minWidth=button.width(); - } - button.css('min-width',settings.minWidth); - settings.minOuterWidth=button.outerWidth()-2; - button.data('settings',settings); - - if(!settings.singleSelect && settings.checked.length>0) { - button.children('span').first().text(settings.labels.join(', ')); - } else if(settings.singleSelect) { - button.children('span').first().text(this.find(':selected').text()); - } - - var self = this; - self.menuDirection = 'down'; - - function closeDropDown() { - if(!button.parent().data('preventHide')) { - // How can I save the effect in a var? - if(self.menuDirection === 'down') { - button.parent().children('ul').slideUp(slideDuration,function() { - button.parent().children('ul').remove(); - button.removeClass('active down'); - $(self).trigger($.Event('dropdownclosed', settings)); - }); - } else { - button.parent().children('ul').fadeOut(slideDuration,function() { - button.parent().children('ul').remove(); - button.removeClass('active up'); - $(self).trigger($.Event('dropdownclosed', settings)); - }); - } - } - } - - button.click(function(event){ - - var button=$(this); - if(button.parent().children('ul').length>0) { - if(self.menuDirection === 'down') { - button.parent().children('ul').slideUp(slideDuration,function() { - button.parent().children('ul').remove(); - button.removeClass('active down'); - $(self).trigger($.Event('dropdownclosed', settings)); - }); - } else { - button.parent().children('ul').fadeOut(slideDuration,function() { - button.parent().children('ul').remove(); - button.removeClass('active up'); - $(self).trigger($.Event('dropdownclosed', settings)); - }); - } - return; - } - // tell other lists to shut themselves - var lists=$('ul.multiselectoptions'); - lists.trigger($.Event('shut')); - button.addClass('active'); - event.stopPropagation(); - var options=$(this).parent().next().children(); - var list=$('
    ').hide().appendTo($(this).parent()); - var inputType = settings.singleSelect ? 'radio' : 'checkbox'; - function createItem(element, checked){ - element=$(element); - var item=element.val(); - var id='ms'+multiSelectId+'-option-'+item; - var input=$(''); - input.attr('id',id); - if(inputType === 'checkbox') { - input.addClass('checkbox'); - } - if(settings.singleSelect) { - input.attr('name', 'ms'+multiSelectId+'-option'); - } - var label=$('