Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26849 from woocommerce/fix/26845 

Put back the remove element for multiselects on selectWoo
This commit is contained in:
Peter Fabian 2020-06-23 15:00:02 +02:00 committed by GitHub
parent fbe03ba256 56d343e26a
commit a442f183ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/selectWoo/selectWoo.full.js
View File

@ -1748,12 +1748,14 @@ S2.define('select2/selection/multiple',[
var selection = data[d]; var selection = data[d];
var $selection = this.selectionContainer(); var $selection = this.selectionContainer();
var removeItemTag = $selection.html();
var formatted = this.display(selection, $selection); var formatted = this.display(selection, $selection);
if ('string' === typeof formatted) { if ('string' === typeof formatted) {
formatted = Utils.entityDecode(formatted.trim()); formatted = Utils.entityDecode(formatted.trim());
} }
$selection.text(formatted); $selection.text(formatted);
$selection.prepend(removeItemTag);
$selection.prop('title', selection.title || selection.text); $selection.prop('title', selection.title || selection.text);
$selection.data('data', selection); $selection.data('data', selection);

2
assets/js/selectWoo/selectWoo.full.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
assets/js/selectWoo/selectWoo.js
View File

@ -1748,12 +1748,14 @@ S2.define('select2/selection/multiple',[
var selection = data[d]; var selection = data[d];
var $selection = this.selectionContainer(); var $selection = this.selectionContainer();
var removeItemTag = $selection.html();
var formatted = this.display(selection, $selection); var formatted = this.display(selection, $selection);
if ('string' === typeof formatted) { if ('string' === typeof formatted) {
formatted = Utils.entityDecode(formatted.trim()); formatted = Utils.entityDecode(formatted.trim());
} }
$selection.text(formatted); $selection.text(formatted);
$selection.prepend(removeItemTag);
$selection.prop('title', selection.title || selection.text); $selection.prop('title', selection.title || selection.text);
$selection.data('data', selection); $selection.data('data', selection);

2
assets/js/selectWoo/selectWoo.min.js vendored
View File

File diff suppressed because one or more lines are too long