mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-03 07:55:36 +00:00
[select2] fixup after rebase
This commit is contained in:
@@ -1749,7 +1749,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;
|
||||||
box-sizing:content-box;
|
min-width: 2em; /* make sure there is enough space */
|
||||||
}
|
}
|
||||||
.select2-results__option .avatar {
|
.select2-results__option .avatar {
|
||||||
margin-right:10px;
|
margin-right:10px;
|
||||||
|
@@ -149,6 +149,16 @@ 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 = [];
|
||||||
@@ -158,6 +168,9 @@ 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%',
|
||||||
@@ -802,6 +815,8 @@ define([
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.show_group_selector = false;
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: url,
|
url: url,
|
||||||
data: data,
|
data: data,
|
||||||
@@ -818,7 +833,8 @@ 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);
|
||||||
|
Reference in New Issue
Block a user