haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 21:30:39 +00:00
Code Issues Releases Wiki Activity

Revert "[select2] fixup after rebase"

Browse Source 
This reverts commit 5fe0865629.
This commit is contained in:
lian
2018-08-03 16:07:05 +08:00
parent c736ca1097
commit 20cb4ce86f
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/css/seahub.css
View File

@@ -1838,7 +1838,7 @@ button.sf-dropdown-toggle:focus {
} }
.select2-container--default .select2-search--inline .select2-search__field { .select2-container--default .select2-search--inline .select2-search__field {
padding:0 5px; padding:0 5px;
min-width: 2em; /* make sure there is enough space */ box-sizing:content-box;
} }
.select2-results__option .avatar { .select2-results__option .avatar {
margin-right:10px; margin-right:10px;

18
static/scripts/app/views/share.js
View File

@@ -149,16 +149,6 @@ define([
}, },
clickGroupShareTab: function() { 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 $add_item = $('#add-dir-group-share-item');
var prepareGroupsSelector = function(groups) { var prepareGroupsSelector = function(groups) {
var group_list = []; var group_list = [];
@@ -168,9 +158,6 @@ define([
text: groups[i].name text: groups[i].name
}); });
} }
$loadingTip.hide();
$table.show();
$('[name="groups"]', $add_item).select2({ $('[name="groups"]', $add_item).select2({
language: Common.i18nForSelect2(), language: Common.i18nForSelect2(),
width: '100%', width: '100%',
@@ -815,8 +802,6 @@ define([
}; };
} }
this.show_group_selector = false;
$.ajax({ $.ajax({
url: url, url: url,
data: data, data: data,
@@ -833,8 +818,7 @@ define([
}); });
$add_item.after(new_item.el); $add_item.after(new_item.el);
}); });
$table.removeClass('hide');
_this.show_group_selector = true;
}, },
error: function(xhr, textStatus, errorThrown) { error: function(xhr, textStatus, errorThrown) {
var err_msg = Common.prepareAjaxErrorMsg(xhr); var err_msg = Common.prepareAjaxErrorMsg(xhr);