Cusotm controls marked loaded before they are loaded for formRender (#…

…853) * fix(controls): controls marked loaded when not loaded for formRender * v2.10.3 * remove track control * update demo files
kevinchappell · Nov 3, 2018 · 3588537 · 3588537
1 parent 4aa1529
commit 3588537
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- v2.10.3 - Bugfix fbControlsLoaded [#853](https://github.com/kevinchappell/formBuilder/pull/853)
 - v2.10.2 - Bugfix i18n lookups [#852](https://github.com/kevinchappell/formBuilder/pull/852)
 - v2.10.1 - Bugfix typeUserAttrs [#851](https://github.com/kevinchappell/formBuilder/pull/851)
 - v2.10.0 - Release 2.10.0 [#842](https://github.com/kevinchappell/formBuilder/pull/842)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-formBuilder v2.10.2
+formBuilder v2.10.3
 ===========
 
 [![Join the chat at https://gitter.im/kevinchappell/formBuilder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kevinchappell/formBuilder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

diff --git a/demo/assets/js/control_plugins/starRating.min.js b/demo/assets/js/control_plugins/starRating.min.js
diff --git a/demo/assets/js/control_plugins/textarea.trumbowyg.min.js b/demo/assets/js/control_plugins/textarea.trumbowyg.min.js
diff --git a/demo/assets/js/demo.min.js b/demo/assets/js/demo.min.js
diff --git a/demo/assets/js/demo.min.js.gz b/demo/assets/js/demo.min.js.gz
diff --git a/demo/assets/js/form-builder.min.js b/demo/assets/js/form-builder.min.js
diff --git a/demo/assets/js/form-builder.min.js.gz b/demo/assets/js/form-builder.min.js.gz
diff --git a/demo/assets/js/form-render.min.js b/demo/assets/js/form-render.min.js
diff --git a/demo/assets/js/form-render.min.js.gz b/demo/assets/js/form-render.min.js.gz
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "formBuilder",
-  "version": "2.10.2",
+  "version": "2.10.3",
   "main": "dist/form-builder.min.js",
   "files": [
     "dist/form-builder.min.js",

diff --git a/src/js/control.js b/src/js/control.js
@@ -200,11 +200,11 @@ export default class control {
     // loop through each defined custom control.
     // expects a function that receives the master control class to inherit from (or optional classRegister to inherit from subclass)
     // see src/js/control_plugins/ for an example
-    if (!window.fbControlsLoaded) {
+    if (!this.fbControlsLoaded) {
       for (const loadControl of controlClasses) {
         loadControl(control, control.classRegister)
       }
-      window.fbControlsLoaded = true
+      this.fbControlsLoaded = true
     }
   }