deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-05-17 21:16:34 +02:00
Code Issues Projects Releases Wiki Activity

Merge 7ffd9bb471 into 8647f36fbe

Browse source
This commit is contained in:
Daiana Cambruzzi Ávila 2021-12-19 10:51:31 -05:00 committed by GitHub
parent 8647f36fbe 7ffd9bb471
commit 9e8448a846
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
public/assets/scripts/choices.js
View file

@ -1,4 +1,4 @@
/*! choices.js v9.0.1 | © 2019 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
/*! choices.js v9.0.1 | © 2020 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
@ -2571,16 +2571,15 @@ function () {
};
Choices.prototype._addEventListeners = function () {
var documentElement = document.documentElement; // capture events - can cancel event processing or propagation
documentElement.addEventListener('touchend', this._onTouchEnd, true);
// capture events - can cancel event processing or propagation
this.containerOuter.element.addEventListener('touchend', this._onTouchEnd, true);
this.containerOuter.element.addEventListener('keydown', this._onKeyDown, true);
this.containerOuter.element.addEventListener('mousedown', this._onMouseDown, true); // passive events - doesn't call `preventDefault` or `stopPropagation`
documentElement.addEventListener('click', this._onClick, {
this.containerOuter.element.addEventListener('click', this._onClick, {
passive: true
});
documentElement.addEventListener('touchmove', this._onTouchMove, {
this.containerOuter.element.addEventListener('touchmove', this._onTouchMove, {
passive: true
});
this.dropdown.element.addEventListener('mouseover', this._onMouseOver, {
@ -2616,12 +2615,11 @@ function () {
};
Choices.prototype._removeEventListeners = function () {
var documentElement = document.documentElement;
documentElement.removeEventListener('touchend', this._onTouchEnd, true);
this.containerOuter.element.removeEventListener('touchend', this._onTouchEnd, true);
this.containerOuter.element.removeEventListener('keydown', this._onKeyDown, true);
this.containerOuter.element.removeEventListener('mousedown', this._onMouseDown, true);
documentElement.removeEventListener('click', this._onClick);
documentElement.removeEventListener('touchmove', this._onTouchMove);
this.containerOuter.element.removeEventListener('click', this._onClick);
this.containerOuter.element.removeEventListener('touchmove', this._onTouchMove);
this.dropdown.element.removeEventListener('mouseover', this._onMouseOver);
if (this._isSelectOneElement) {
@ -3577,7 +3575,7 @@ function () {
};
Choices.prototype._generatePlaceholderValue = function () {
if (this._isSelectElement) {
if (this._isSelectElement && this.passedElement.placeholderOption) {
var placeholderOption = this.passedElement.placeholderOption;
return placeholderOption ? placeholderOption.text : null;
}

6
public/assets/scripts/choices.min.js vendored
View file

File diff suppressed because one or more lines are too long

33
src/scripts/choices.ts
View file

@ -1334,10 +1334,12 @@ class Choices implements Choices {
}
_addEventListeners(): void {
const { documentElement } = document;
// capture events - can cancel event processing or propagation
documentElement.addEventListener('touchend', this._onTouchEnd, true);
this.containerOuter.element.addEventListener(
'touchend',
this._onTouchEnd,
true,
);
this.containerOuter.element.addEventListener(
'keydown',
this._onKeyDown,
@ -1350,10 +1352,16 @@ class Choices implements Choices {
);
// passive events - doesn't call `preventDefault` or `stopPropagation`
documentElement.addEventListener('click', this._onClick, { passive: true });
documentElement.addEventListener('touchmove', this._onTouchMove, {
this.containerOuter.element.addEventListener('click', this._onClick, {
passive: true,
});
this.containerOuter.element.addEventListener(
'touchmove',
this._onTouchMove,
{
passive: true,
},
);
this.dropdown.element.addEventListener('mouseover', this._onMouseOver, {
passive: true,
});
@ -1388,9 +1396,11 @@ class Choices implements Choices {
}
_removeEventListeners(): void {
const { documentElement } = document;
documentElement.removeEventListener('touchend', this._onTouchEnd, true);
this.containerOuter.element.removeEventListener(
'touchend',
this._onTouchEnd,
true,
);
this.containerOuter.element.removeEventListener(
'keydown',
this._onKeyDown,
@ -1402,8 +1412,11 @@ class Choices implements Choices {
true,
);
documentElement.removeEventListener('click', this._onClick);
documentElement.removeEventListener('touchmove', this._onTouchMove);
this.containerOuter.element.removeEventListener('click', this._onClick);
this.containerOuter.element.removeEventListener(
'touchmove',
this._onTouchMove,
);
this.dropdown.element.removeEventListener('mouseover', this._onMouseOver);
if (this._isSelectOneElement) {