Merge pull request #14 from cybtachyon/hotfix/20200211--image-urls

20200211: Arbitrates image urls to be relative

Author: cybtachyon

js/patternkit.jsoneditor.js

@@ -96,8 +96,7 @@
               this.urlfield.addEventListener('change', function(e) {
                 e.preventDefault();
                 e.stopPropagation();
-                self.value = this.value;
-                self.refreshPreview();
+                self.setValue(this.value);
               });
               this.button.addEventListener('click', function(e) {
                 e.preventDefault();
@@ -176,6 +175,7 @@
               this.value = val;
               this.urlfield.value = this.value;
               this.refreshPreview();
+              this.refreshWatchedFieldValues();
               this.onChange(true);
             }
           },

src/Controller/PatternkitController.php

@@ -2,9 +2,6 @@
 
 namespace Drupal\patternkit\Controller;
 
-use Drupal\Console\Command\Generate\AjaxCommand;
-use Drupal\Console\Generator\AjaxCommandGenerator;
-use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Asset\LibraryDiscoveryInterface;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -14,7 +11,6 @@
 use Drupal\media_library\MediaLibraryState;
 use Drupal\media_library\MediaLibraryUiBuilder;
 use Drupal\patternkit\Pattern;
-use Exception;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpFoundation\JsonResponse;

src/JSONSchemaEditorTrait.php

@@ -3,9 +3,7 @@
 namespace Drupal\patternkit;
 
 use Drupal\Core\Url;
-use Drupal\media_library\MediaLibraryState;
 use Drupal\patternkit\Form\PatternLibraryJSONForm;
-use function urlencode;
 
 /**
  * Adds a schema editor render array generator without needing a full service.

src/MediaLibraryJSONLibraryOpener.php

@@ -69,10 +69,10 @@ public function getSelectionResponse(MediaLibraryState $state, array $selected_i
     }
     try {
       if ($file->hasLinkTemplate('canonical')) {
-        $url = $file->toUrl()->setAbsolute(TRUE);
+        $url = $file->toUrl()->setAbsolute(FALSE);
       }
       elseif ($file->access('download')) {
-        $url = file_create_url($file->getFileUri());
+        $url = file_url_transform_relative(file_create_url($file->getFileUri()));
       }
       else {
         $url = $file->label();