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

contao · May 10, 2019 · d9f80ef · d9f80ef
1 parent 390b8e8
commit d9f80ef
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,6 @@
         "contao-components/mediabox": "^1.5",
         "contao-components/mediaelement": "^4.1",
         "contao-components/mootools": "^1.6.0.1",
-        "contao-components/respimage": "^1.4",
         "contao-components/simplemodal": "^2.1",
         "contao-components/swipe": "^2.0.3",
         "contao-components/tablesort": "^4.0",

diff --git a/core-bundle/composer.json b/core-bundle/composer.json
@@ -33,7 +33,6 @@
         "contao-components/mediabox": "^1.5",
         "contao-components/mediaelement": "^4.1",
         "contao-components/mootools": "^1.6.0.1",
-        "contao-components/respimage": "^1.4",
         "contao-components/simplemodal": "^2.1",
         "contao-components/swipe": "^2.0.3",
         "contao-components/tablesort": "^4.0",

diff --git a/core-bundle/src/Resources/contao/dca/tl_layout.php b/core-bundle/src/Resources/contao/dca/tl_layout.php
@@ -94,7 +94,7 @@
 	'palettes' => array
 	(
 		'__selector__'                => array('rows', 'cols', 'addJQuery', 'addMooTools', 'static'),
-		'default'                     => '{title_legend},name;{header_legend},rows;{column_legend},cols;{sections_legend:hide},sections;{webfonts_legend:hide},webfonts;{style_legend},framework,stylesheet,external,loadingOrder,combineScripts;{picturefill_legend:hide},picturefill;{modules_legend},modules;{script_legend},scripts,analytics,externalJs,script;{jquery_legend:hide},addJQuery;{mootools_legend:hide},addMooTools;{static_legend:hide},static;{expert_legend:hide},template,minifyMarkup,viewport,titleTag,cssClass,onload,head'
+		'default'                     => '{title_legend},name;{header_legend},rows;{column_legend},cols;{sections_legend:hide},sections;{webfonts_legend:hide},webfonts;{style_legend},framework,stylesheet,external,loadingOrder,combineScripts;{modules_legend},modules;{script_legend},scripts,analytics,externalJs,script;{jquery_legend:hide},addJQuery;{mootools_legend:hide},addMooTools;{static_legend:hide},static;{expert_legend:hide},template,minifyMarkup,viewport,titleTag,cssClass,onload,head'
 	),
 
 	// Subpalettes
@@ -405,13 +405,6 @@
 			'eval'                    => array('multiple'=>true),
 			'sql'                     => "text NULL"
 		),
-		'picturefill' => array
-		(
-			'label'                   => &$GLOBALS['TL_LANG']['tl_layout']['picturefill'],
-			'exclude'                 => true,
-			'inputType'               => 'checkbox',
-			'sql'                     => "char(1) NOT NULL default ''"
-		),
 		'analytics' => array
 		(
 			'label'                   => &$GLOBALS['TL_LANG']['tl_layout']['analytics'],

diff --git a/core-bundle/src/Resources/contao/languages/en/tl_image_size.xlf b/core-bundle/src/Resources/contao/languages/en/tl_image_size.xlf
@@ -122,9 +122,6 @@
       <trans-unit id="tl_image_size.delete.1">
         <source>Delete image size ID %s</source>
       </trans-unit>
-      <trans-unit id="tl_image_size.picturefill">
-        <source>The &lt;em&gt;%s&lt;/em&gt; option needs to be enabled in the page layout.</source>
-      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/core-bundle/src/Resources/contao/languages/en/tl_layout.xlf b/core-bundle/src/Resources/contao/languages/en/tl_layout.xlf
@@ -266,12 +266,6 @@
       <trans-unit id="tl_layout.mootools.1">
         <source>Here you can select one or more MooTools templates.</source>
       </trans-unit>
-      <trans-unit id="tl_layout.picturefill.0">
-        <source>Load the image polyfill</source>
-      </trans-unit>
-      <trans-unit id="tl_layout.picturefill.1">
-        <source>Include the image polyfill (&lt;em&gt;respimage.js&lt;/em&gt;) in the layout.</source>
-      </trans-unit>
       <trans-unit id="tl_layout.scripts.0">
         <source>JavaScript templates</source>
       </trans-unit>
@@ -332,9 +326,6 @@
       <trans-unit id="tl_layout.style_legend">
         <source>Style sheets</source>
       </trans-unit>
-      <trans-unit id="tl_layout.picturefill_legend">
-        <source>Responsive images</source>
-      </trans-unit>
       <trans-unit id="tl_layout.modules_legend">
         <source>Front end modules</source>
       </trans-unit>

diff --git a/core-bundle/src/Resources/contao/models/LayoutModel.php b/core-bundle/src/Resources/contao/models/LayoutModel.php
@@ -36,7 +36,6 @@
  * @property string  $template
  * @property string  $minifyMarkup
  * @property string  $webfonts
- * @property boolean $picturefill
  * @property string  $viewport
  * @property string  $titleTag
  * @property string  $cssClass

diff --git a/core-bundle/src/Resources/contao/pages/PageRegular.php b/core-bundle/src/Resources/contao/pages/PageRegular.php
@@ -448,12 +448,6 @@ protected function createTemplate($objPage, $objLayout)
 			}
 		}
 
-		// Picturefill
-		if ($objLayout->picturefill)
-		{
-			$GLOBALS['TL_JAVASCRIPT'][] = 'assets/respimage/js/respimage.min.js|static';
-		}
-
 		// Check whether TL_APPEND_JS exists (see #4890)
 		if (!empty($arrAppendJs))
 		{

diff --git a/core-bundle/tests/Functional/app/Resources/contao_test.sql b/core-bundle/tests/Functional/app/Resources/contao_test.sql
@@ -719,7 +719,6 @@ CREATE TABLE `tl_layout` (
   `modules` blob DEFAULT NULL,
   `template` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `webfonts` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
-  `picturefill` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `viewport` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `titleTag` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `cssClass` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',