Merge pull request #1008 from Patternslib/registry-improvements

Registry improvements

Author: thet

src/core/base.js

@@ -28,6 +28,7 @@ const initBasePattern = function ($el, options, trigger) {
     let pattern = $el.data(`pattern-${name}`);
     if (pattern === undefined && Registry.patterns[name]) {
         try {
+            $el.data(`pattern-${name}`, "initializing");
             options =
                 this.prototype.parser === "mockup"
                     ? mockupParser.getOptions($el, name, options)

src/core/registry.js

@@ -50,19 +50,25 @@ if (typeof window.__patternslib_registry === "undefined") {
     window.__patternslib_registry = {};
 }
 export const PATTERN_REGISTRY = window.__patternslib_registry;
+if (typeof window.__patternslib_registry_initialized === "undefined") {
+    window.__patternslib_registry_initialized = false;
+}
 
 const registry = {
     patterns: PATTERN_REGISTRY, // reference to global patterns registry
     // as long as the registry is not initialized, pattern
     // registration just registers a pattern. Once init is called,
     // the DOM is scanned. After that registering a new pattern
     // results in rescanning the DOM only for this pattern.
-    initialized: false,
     init() {
         $(document).ready(function () {
+            if (window.__patternslib_registry_initialized) {
+                // Do not reinitialize a already initialized registry.
+                return;
+            }
+            window.__patternslib_registry_initialized = true;
             log.info("loaded: " + Object.keys(registry.patterns).sort().join(", "));
             registry.scan(document.body);
-            registry.initialized = true;
             log.info("finished initial scan.");
         });
     },
@@ -211,7 +217,9 @@ const registry = {
             $.fn[plugin_name.replace(/^pat/, "pattern")] = $.fn[plugin_name];
         }
         log.debug("Registered pattern:", name, pattern);
-        if (registry.initialized) {
+        if (window.__patternslib_registry_initialized) {
+            // Once the first initialization has been done, do only scan for
+            // newly registered patterns.
             registry.scan(document.body, [name]);
         }
         return true;