From 9548294b3b7f7bc4204dc1275b70c79c7a349f38 Mon Sep 17 00:00:00 2001
From: Gabor Hojtsy <gabor@hojtsy.hu>
Date: Tue, 27 Jun 2017 16:33:23 +0200
Subject: [PATCH] Issue #2887269 by Manuel Garcia, phenaproxima, larowlan, xjm:
 Remove unnecessary prefixing from media libraries

---
 core/modules/media/js/{media_form.es6.js => form.es6.js}  | 0
 core/modules/media/js/{media_form.js => form.js}          | 0
 .../media/js/{media_type_form.es6.js => type_form.es6.js} | 0
 .../modules/media/js/{media_type_form.js => type_form.js} | 0
 core/modules/media/media.libraries.yml                    | 8 ++++----
 core/modules/media/src/MediaForm.php                      | 2 +-
 core/modules/media/src/MediaTypeForm.php                  | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename core/modules/media/js/{media_form.es6.js => form.es6.js} (100%)
 rename core/modules/media/js/{media_form.js => form.js} (100%)
 rename core/modules/media/js/{media_type_form.es6.js => type_form.es6.js} (100%)
 rename core/modules/media/js/{media_type_form.js => type_form.js} (100%)

diff --git a/core/modules/media/js/media_form.es6.js b/core/modules/media/js/form.es6.js
similarity index 100%
rename from core/modules/media/js/media_form.es6.js
rename to core/modules/media/js/form.es6.js
diff --git a/core/modules/media/js/media_form.js b/core/modules/media/js/form.js
similarity index 100%
rename from core/modules/media/js/media_form.js
rename to core/modules/media/js/form.js
diff --git a/core/modules/media/js/media_type_form.es6.js b/core/modules/media/js/type_form.es6.js
similarity index 100%
rename from core/modules/media/js/media_type_form.es6.js
rename to core/modules/media/js/type_form.es6.js
diff --git a/core/modules/media/js/media_type_form.js b/core/modules/media/js/type_form.js
similarity index 100%
rename from core/modules/media/js/media_type_form.js
rename to core/modules/media/js/type_form.js
diff --git a/core/modules/media/media.libraries.yml b/core/modules/media/media.libraries.yml
index eecaf8ed1f27..72496a323322 100644
--- a/core/modules/media/media.libraries.yml
+++ b/core/modules/media/media.libraries.yml
@@ -1,13 +1,13 @@
-media_form:
+form:
   version: VERSION
   js:
-    js/media_form.js: {}
+    js/form.js: {}
   dependencies:
     - core/drupal.form
 
-media_type_form:
+type_form:
   version: VERSION
   js:
-    js/media_type_form.js: {}
+    js/type_form.js: {}
   dependencies:
     - core/drupal.form
diff --git a/core/modules/media/src/MediaForm.php b/core/modules/media/src/MediaForm.php
index 1e91e9f62796..f98889fc971b 100644
--- a/core/modules/media/src/MediaForm.php
+++ b/core/modules/media/src/MediaForm.php
@@ -47,7 +47,7 @@ class MediaForm extends ContentEntityForm {
       $form['created']['#group'] = 'author';
     }
 
-    $form['#attached']['library'][] = 'media/media_form';
+    $form['#attached']['library'][] = 'media/form';
 
     $form['#entity_builders']['update_status'] = [$this, 'updateStatus'];
 
diff --git a/core/modules/media/src/MediaTypeForm.php b/core/modules/media/src/MediaTypeForm.php
index 9ae84e9baaf4..3a96291e5a28 100644
--- a/core/modules/media/src/MediaTypeForm.php
+++ b/core/modules/media/src/MediaTypeForm.php
@@ -176,7 +176,7 @@ class MediaTypeForm extends EntityForm {
     $form['additional_settings'] = [
       '#type' => 'vertical_tabs',
       '#attached' => [
-        'library' => ['media/media_type_form'],
+        'library' => ['media/type_form'],
       ],
     ];