Issue #2648236 by Berdir: Give iframes a name to facilitate testing

marcingy · Jan 25, 2016 · a0d3351 · a0d3351
1 parent a39e6ab
commit a0d3351
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/js/entity_browser.iframe.js b/js/entity_browser.iframe.js
@@ -37,7 +37,8 @@
         'width' : drupalSettings['entity_browser']['iframe'][uuid]['width'],
         'height' : drupalSettings['entity_browser']['iframe'][uuid]['height'],
         'data-uuid' : uuid,
-        'data-original-path' : original_path
+        'data-original-path' : original_path,
+        'name' : 'entity-browser-iframe-' + drupalSettings['entity_browser']['iframe'][uuid]['entity_browser_id'].replace('_', '-')
       }
     );
 

diff --git a/src/Plugin/EntityBrowser/Display/Modal.php b/src/Plugin/EntityBrowser/Display/Modal.php
@@ -6,6 +6,7 @@
 
 namespace Drupal\entity_browser\Plugin\EntityBrowser\Display;
 
+use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Uuid\UuidInterface;
 use Drupal\Core\Ajax\OpenModalDialogCommand;
@@ -209,7 +210,8 @@ public function openModal(array &$form, FormStateInterface $form_state) {
         'width' => '100%',
         'height' => $this->configuration['height'] - 90,
         'frameborder' => 0,
-        'style' => 'padding:'
+        'style' => 'padding:',
+        'name' => Html::cleanCssIdentifier('entity-browser-iframe-' . $this->configuration['entity_browser_id'])
       ],
     ];
     $html = drupal_render($content);