Fix Select2 integration in Form component

2016-04-11 16:27:26 +03:00
parent 49a59d35a1
commit e35e97cdbf
2 changed files with 4 additions and 8 deletions
--- a/assets/js/src/form/fields/selection.jsx
+++ b/assets/js/src/form/fields/selection.jsx
@ -14,10 +14,12 @@ function(
      return {
        items: [],
        initialized: false
-      }
+      };
+    },
+    componentWillMount: function() {
+      this.loadCachedItems();
    },
    componentDidMount: function() {
-      this.loadCachedItems();
      this.setupSelect2();
    },
    componentDidUpdate: function(prevProps, prevState) {
@ -70,11 +72,6 @@ function(

      select2.on('change', this.handleChange);

-      select2.select2(
-        'val',
-        this.getSelectedValues()
-      );
-
      this.setState({ initialized: true });
    },
    getSelectedValues: function() {