Merge pull request #10 from cybtachyon/patternkit-caching-fixes

Updates editor and caching config defaults

Author: cybtachyon

js/patternkit.jsoneditor.js

@@ -46,11 +46,7 @@
         var data = {};
         data.schema = JSON.parse(drupalSettings.patternkitEditor.schemaJson);
         data.starting = JSON.parse(drupalSettings.patternkitEditor.startingJson);
-        data.icons = drupalSettings.patternkitEditor.icons;
 
-        if (data.starting !== null) {
-          JSONEditor.defaults.options.startval = data.starting;
-        }
         JSONEditor.defaults.options.theme = drupalSettings.patternkitEditor.theme;
         JSONEditor.defaults.options.iconlib = drupalSettings.patternkitEditor.icons;
         JSONEditor.defaults.options.keep_oneof_values = false;
@@ -122,12 +118,14 @@
         };
 
         // Initialize the editor with a JSON schema.
-        var editor = new JSONEditor(
-          $target[0].shadowRoot.getElementById('editor_holder'), {
-            schema: data.schema,
-            refs: { }
-          }
-        );
+        var config = {
+          schema: data.schema,
+          refs: { }
+        };
+        if (typeof data.starting === 'object' && !$.isEmptyObject(data.starting)) {
+          config.startval = data.starting;
+        }
+        var editor = new JSONEditor($target[0].shadowRoot.getElementById('editor_holder'), config);
         JSONEditor.plugins.sceditor.emoticonsEnabled = false;
         var saveSchema = function () {
           $('#schema_instance_config').val(JSON.stringify(editor.getValue()));
@@ -150,7 +148,6 @@
         // to trigger the editor update with latest field values.
         // @TODO Add handling for AJAX errors and re-attach.
         Drupal.Ajax.prototype.beforeSubmit = function(formValues, element, options) {
-          debugger;
           editor.disable();
           saveSchema();
           for (var v = 0; v < formValues.length; v++) {

src/Loader/PatternLibraryLoader.php

@@ -4,7 +4,6 @@
 
 use Drupal\Core\Logger\LoggerChannelInterface;
 use Drupal\patternkit\PatternLibraryCollector;
-use Exception;
 
 /**
  * Functionality for parsing Twig pattern libraries.
@@ -31,7 +30,7 @@ public function __construct($paths,
     try {
       $libraries = $pattern_collector->getLibraryDefinitions();
     }
-    catch (Exception $exception) {
+    catch (\Exception $exception) {
       $logger->error('Error loading pattern libraries: @message', ['@message' => $exception->getMessage()]);
     }
     foreach ($libraries as $namespace => $library) {

src/PatternLibraryCollector.php

@@ -157,7 +157,7 @@ public function getLibraryDefinitions(): array {
       $cached_metadata = $this->getLibraryMetadata();
       // Cache the data so that we don't have to build it again.
       // (if cache enabled, otherwise just a slow, redundant memcache set).
-      if ($cache_enabled === TRUE) {
+      if ($cache_enabled) {
         // Explicit copy of the data into cache_set to avoid implicit copy.
         $this->cache->set(static::PERSISTENT_CACHE_ID,
           $cached_metadata);