Remove the contao-components/mediaelement component (see #332)

contao · May 10, 2019 · 8b3e027 · 8b3e027
1 parent 29b0c47
commit 8b3e027
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 78 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,6 @@
         "contao-components/jquery": "^1.12 || ^2.0 || ^3.0",
         "contao-components/jquery-ui": "^1.11.4",
         "contao-components/mediabox": "^1.5",
-        "contao-components/mediaelement": "^4.1",
         "contao-components/mootools": "^1.6.0.1",
         "contao-components/simplemodal": "^2.1",
         "contao-components/swipe": "^2.0.3",

diff --git a/src/Resources/contao/dca/tl_image_size.php b/src/Resources/contao/dca/tl_image_size.php
@@ -22,8 +22,7 @@
 		'markAsCopy'                  => 'name',
 		'onload_callback' => array
 		(
-			array('tl_image_size', 'checkPermission'),
-			array('tl_image_size', 'showJsLibraryHint')
+			array('tl_image_size', 'checkPermission')
 		),
 		'oncreate_callback' => array
 		(
@@ -353,23 +352,6 @@ public function listImageSize($row)
 		return $html;
 	}
 
-	/**
-	 * Show a hint if a JavaScript library needs to be included in the page layout
-	 */
-	public function showJsLibraryHint()
-	{
-		if ($_POST || Contao\Input::get('act') != 'edit')
-		{
-			return;
-		}
-
-		// Return if the user cannot access the layout module (see #6190)
-		if (!$this->User->hasAccess('themes', 'modules') || !$this->User->hasAccess('layout', 'themes'))
-		{
-			return;
-		}
-	}
-
 	/**
 	 * Return the edit header button
 	 *

diff --git a/src/Resources/contao/dca/tl_image_size_item.php b/src/Resources/contao/dca/tl_image_size_item.php
@@ -22,8 +22,7 @@
 		'markAsCopy'                  => 'media',
 		'onload_callback' => array
 		(
-			array('tl_image_size_item', 'checkPermission'),
-			array('tl_image_size_item', 'showJsLibraryHint')
+			array('tl_image_size_item', 'checkPermission')
 		),
 		'sql' => array
 		(
@@ -261,23 +260,6 @@ public function listImageSizeItem($row)
 		return $html;
 	}
 
-	/**
-	 * Show a hint if a JavaScript library needs to be included in the page layout
-	 */
-	public function showJsLibraryHint()
-	{
-		if ($_POST || Contao\Input::get('act') != 'edit')
-		{
-			return;
-		}
-
-		// Return if the user cannot access the layout module (see #6190)
-		if (!$this->User->hasAccess('themes', 'modules') || !$this->User->hasAccess('layout', 'themes'))
-		{
-			return;
-		}
-	}
-
 	/**
 	 * Return the "toggle visibility" button
 	 *

diff --git a/src/Resources/contao/templates/jquery/j_mediaelement.html5 b/src/Resources/contao/templates/jquery/j_mediaelement.html5
diff --git a/src/Resources/contao/templates/js/js_mediaelement.html5 b/src/Resources/contao/templates/js/js_mediaelement.html5