mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-14 20:19:47 +01:00
Code Issues Projects Releases Wiki Activity

Don't hide icon "remove item" on picker (master) (#5796)

Browse Source 
* Don't hide icon "close" on picker

* Update CHANGELOG.md (#5780)
This commit is contained in:
Yuriy Bakhtin 2022-07-06 11:22:21 +03:00 committed by GitHub
parent 07d9f8f9b6
commit 5868e48c02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ HumHub Changelog
1.11.4 (Unreleased)
----------------------
- Fix #5776: Hide beta modules on disabled filter
- Fix #5780: Don't hide icon "remove item" on picker
1.11.3 (June 27, 2022)
----------------------

2
protected/humhub/config/assets-prod.php
View File

@ -2,7 +2,7 @@
/**
* This file is generated by the "yii asset" command.
* DO NOT MODIFY THIS FILE DIRECTLY.
* @version 2021-12-22 09:17:29
* @version 2022-07-05 18:53:28
*/
return [
'app' => [

9
static/js/humhub/humhub.ui.picker.js
View File

@ -207,9 +207,8 @@ humhub.module('ui.picker', function (module, require, $) {
};
Picker.template = {
selectionWithImage: '{imageNode}<span class="picker-text with-image"></span>',
selectionNoImage: '<span class="picker-text no-image"></span>',
selectionClear: ' <i class="fa fa-times-circle picker-close"></i>',
selectionWithImage: '{imageNode}<span class="picker-text with-image"></span> <i class="fa fa-times-circle picker-close"></i>',
selectionNoImage: '<span class="picker-text no-image"></span> <i class="fa fa-times-circle picker-close"></i>',
result: '<a href="#" tabindex="-1" style="margin-right:5px;">{imageNode} <span class="picker-text"></span></a>',
resultDisabled: '<a href="#" title="{disabledText}" data-placement="right" tabindex="-1" style="margin-right:5px;opacity: 0.4;cursor:not-allowed">{imageNode} <span class="picker-text"></span></a>',
imageNode: '<img class="img-rounded" src="{image}" alt="" style="width:24px;height:24px;" height="24" width="24">',
@ -303,10 +302,6 @@ humhub.module('ui.picker', function (module, require, $) {
var selectionTmpl = (item.image && !item.new) ? Picker.template.selectionWithImage : Picker.template.selectionNoImage;
if (this.$.data('tags')) {
selectionTmpl += Picker.template.selectionClear;
}
var $result = $(string.template(selectionTmpl, item));
var test = $result.find('.picker-text');