From 20cb4ce86fdbd80fdf5a08df92c148c0be7a6a65 Mon Sep 17 00:00:00 2001 From: lian Date: Fri, 3 Aug 2018 16:07:05 +0800 Subject: [PATCH] Revert "[select2] fixup after rebase" This reverts commit 5fe0865629913cfd23dcbdef273cefc2b985524e. --- media/css/seahub.css | 2 +- static/scripts/app/views/share.js | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/media/css/seahub.css b/media/css/seahub.css index 7a4c498c59..2b343ef7d3 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1838,7 +1838,7 @@ button.sf-dropdown-toggle:focus { } .select2-container--default .select2-search--inline .select2-search__field { padding:0 5px; - min-width: 2em; /* make sure there is enough space */ + box-sizing:content-box; } .select2-results__option .avatar { margin-right:10px; diff --git a/static/scripts/app/views/share.js b/static/scripts/app/views/share.js index e6b77a31a5..77aa69235e 100644 --- a/static/scripts/app/views/share.js +++ b/static/scripts/app/views/share.js @@ -149,16 +149,6 @@ define([ }, clickGroupShareTab: function() { - if (!this.show_group_selector || this.group_tab_clicked) { - return; - } - - this.group_tab_clicked = true; - - var $loadingTip = this.$('.loading-tip').show(); - var $panel = this.$('#dir-group-share'); - var $table = $('table', $panel); - var $add_item = $('#add-dir-group-share-item'); var prepareGroupsSelector = function(groups) { var group_list = []; @@ -168,9 +158,6 @@ define([ text: groups[i].name }); } - - $loadingTip.hide(); - $table.show(); $('[name="groups"]', $add_item).select2({ language: Common.i18nForSelect2(), width: '100%', @@ -815,8 +802,6 @@ define([ }; } - this.show_group_selector = false; - $.ajax({ url: url, data: data, @@ -833,8 +818,7 @@ define([ }); $add_item.after(new_item.el); }); - - _this.show_group_selector = true; + $table.removeClass('hide'); }, error: function(xhr, textStatus, errorThrown) { var err_msg = Common.prepareAjaxErrorMsg(xhr);