Merge pull request magento#4143 from magento-performance/MC-16005

MC-16005
p-bystritsky · May 1, 2019 · c5c1586 · c5c1586
2 parents c1879e4 + bc7a00c
commit c5c1586
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -182,10 +182,6 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>
                 </field>
-                <field id="move_inline_to_bottom" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Move JS code to the bottom of the page</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
             </group>
             <group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>CSS Settings</label>

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -14,7 +14,7 @@
  */
 class JsFooterPlugin
 {
-    private const XML_PATH_DEV_MOVE_JS_TO_BOTTOM = 'dev/js/move_inline_to_bottom';
+    private const XML_PATH_DEV_MOVE_JS_TO_BOTTOM = 'dev/js/move_script_to_bottom';
 
     /**
      * @var ScopeConfigInterface

diff --git a/app/code/Magento/Theme/etc/system.xml → ...de/Magento/Theme/etc/adminhtml/system.xml b/app/code/Magento/Theme/etc/system.xml → ...de/Magento/Theme/etc/adminhtml/system.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="dev" translate="label" type="text" sortOrder="920" showInDefault="1" showInWebsite="1" showInStore="1">
-            <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                <field id="move_inline_to_bottom" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+            <group id="js">
+                <field id="move_script_to_bottom" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Move JS code to the bottom of the page</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>

diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml
@@ -68,7 +68,7 @@ Disallow: /*SID=
             </static>
             <dev>
                 <js>
-                    <move_inline_to_bottom>0</move_inline_to_bottom>
+                    <move_script_to_bottom>0</move_script_to_bottom>
                 </js>
             </dev>
         </dev>
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,7 @@ Disallow: /*SID= @@
                 </static>
                 <dev>
                     <js>
-                        <move_inline_to_bottom>0</move_inline_to_bottom>
+                        <move_script_to_bottom>0</move_script_to_bottom>
                     </js>
                 </dev>
             </dev>
@@ Expand Down @@