Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Removes state and updates method to test if Select2 is initialized

Browse Source
This commit is contained in:
Vlad
2018-02-01 17:53:16 -05:00
parent 80a3bbd030
commit ae9f373cff
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/js/src/form/fields/selection.jsx
View File

@@ -10,16 +10,11 @@ define([
jQuery jQuery
) => { ) => {
const Selection = React.createClass({ const Selection = React.createClass({
getInitialState: function () {
return {
select2: false,
};
},
allowMultipleValues: function () { allowMultipleValues: function () {
return (this.props.field.multiple === true); return (this.props.field.multiple === true);
}, },
isSelect2Initialized: function () { isSelect2Initialized: function () {
return (this.state.select2 === true); return (jQuery(`#${this.refs.select.id}`).hasClass('select2-hidden-accessible') === true)
}, },
componentDidMount: function () { componentDidMount: function () {
if (this.allowMultipleValues() || this.props.field.forceSelect2) { if (this.allowMultipleValues() || this.props.field.forceSelect2) {
@@ -58,7 +53,6 @@ define([
destroySelect2: function () { destroySelect2: function () {
if (this.isSelect2Initialized()) { if (this.isSelect2Initialized()) {
jQuery(`#${this.refs.select.id}`).select2('destroy').find('option:not(.default)').remove(); jQuery(`#${this.refs.select.id}`).select2('destroy').find('option:not(.default)').remove();
this.state.select2 = false;
} }
}, },
setupSelect2: function () { setupSelect2: function () {
@@ -128,8 +122,6 @@ define([
}); });
select2.on('change', this.handleChange); select2.on('change', this.handleChange);
this.state.select2 = true;
}, },
getSelectedValues: function () { getSelectedValues: function () {
if (this.props.field.selected !== undefined) { if (this.props.field.selected !== undefined) {