MAGETWO-32814: Fix dependency in inline code

Denys Rul · Denys Rul · commit 78d0045b982f · 2015-01-19T18:07:14.000+02:00
- Make a first step to remove prototype.js from a page header
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset.php b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset.php
@@ -214,7 +214,7 @@ protected function _getFooterHtml($element)
     protected function _getExtraJs($element)
     {
         $htmlId = $element->getHtmlId();
-        $output = "Fieldset.applyCollapse('{$htmlId}');";
+        $output = "require(['prototype'], function(){Fieldset.applyCollapse('{$htmlId}');});";
         return $this->_jsHelper->getScript($output);
     }
 
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -75,7 +75,6 @@
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
             <block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>
-            <block class="Magento\Framework\View\Element\Template" name="head.scripts" template="Magento_Backend::page/js/head_scripts.phtml"/>
             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Backend::page/js/components.phtml"/>
             <block class="Magento\Framework\View\Element\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Backend::page/js/calendar.phtml"/>
         </referenceContainer>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -7,7 +7,9 @@
 
 <?php if (is_array($this->getChildBlock('diagrams')->getTabsIds())) : ?>
 <script>
-function changeDiagramsPeriod(periodObj) {
+require(['prototype'], function(){
+
+window.changeDiagramsPeriod = function(periodObj) {
     periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
 <?php foreach ($this->getChildBlock('diagrams')->getTabsIds() as $tabId): ?>
     ajaxBlockParam = 'block/tab_<?php echo $tabId ?>/';
@@ -60,10 +62,7 @@ function changeDiagramsPeriod(periodObj) {
     });
 }
 
-function toggleCal(id) {
-    $('dashboard_'+id+'_cal_div').toggle();
-    $('dashboard_'+id+'_range_div').toggle();
-}
+});
 </script>
 <?php endif; ?>
  <div class="dashboard-container">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
@@ -32,24 +32,29 @@
 </select>
 </p>
 <script>
-    function switchStore(obj){
-        if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
-            var selectionType = 'website';
-        } else if (obj.options[obj.selectedIndex].getAttribute('group') == 'true') {
-            var selectionType = 'group';
-        } else {
-            var selectionType = 'store';
+    require([
+        'prototype'
+    ], function () {
+
+        window.switchStore = function (obj) {
+            if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
+                var selectionType = 'website';
+            } else if (obj.options[obj.selectedIndex].getAttribute('group') == 'true') {
+                var selectionType = 'group';
+            } else {
+                var selectionType = 'store';
+            }
+            var storeParam = obj.value ? selectionType + '/' + obj.value + '/' : '';
+            if (obj.switchParams) {
+                storeParam += obj.switchParams;
+            }
+            if ($('diagram_tab_orders_content').style.display != 'none') {
+                var select = $('order_orders_period');
+            } else if ($('diagram_tab_amounts_content').style.display != 'none') {
+                var select = $('order_amounts_period');
+            }
+            var periodParam = select.value ? 'period/' + select.value + '/' : '';
+            setLocation('<?php echo $this->getSwitchUrl() ?>' + storeParam + periodParam);
         }
-        var storeParam = obj.value ? selectionType + '/' + obj.value + '/' : '';
-        if(obj.switchParams){
-            storeParam+= obj.switchParams;
-        }
-        if ($('diagram_tab_orders_content').style.display != 'none') {
-            var select = $('order_orders_period');
-        } else if ($('diagram_tab_amounts_content').style.display != 'none') {
-            var select = $('order_amounts_period');
-        }
-        var periodParam = select.value ? 'period/'+select.value + '/' : '';
-        setLocation('<?php echo $this->getSwitchUrl() ?>'+storeParam+periodParam);
-    }
+    });
 </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
@@ -7,8 +7,3 @@
 <nav data-mage-init='{"globalNavigation": {}}' class="navigation">
     <?php echo $this->renderNavigation($this->getMenuModel(), 0, 12); ?>
 </nav>
-
-<?php /* @TODO: find the place for the help ?>
-<a id="page-help-link" href="<?php echo $this->helper('Magento\Backend\Helper\Data')->getPageHelpUrl() ?>"><?php echo __('Get help for this page') ?></a>
-<script>$('page-help-link').target = 'magento_page_help'</script>
-<?php */ ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/head_scripts.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/head_scripts.phtml
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/system/config/robots/reset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/system/config/robots/reset.phtml
@@ -12,12 +12,15 @@ $coreHelper = $this->helper('Magento\Core\Helper\Data');
 ?>
 
 <script>
-    function resetRobotsToDefault()
-    {
-        $('design_search_engine_robots_custom_instructions').value = <?php
-            echo $coreHelper->jsonEncode($this->getRobotsDefaultCustomInstructions())
-        ?>;
-    }
+    require([
+        'prototype'
+    ], function () {
+        window.resetRobotsToDefault = function(){
+            $('design_search_engine_robots_custom_instructions').value = <?php
+                echo $coreHelper->jsonEncode($this->getRobotsDefaultCustomInstructions())
+            ?>;
+        }
+    });
 </script>
 
 <?php echo $this->getButtonHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
@@ -18,8 +18,9 @@
     <?php echo $this->getBlockHtml('formkey')?>
 
     <script>
-    function setCacheAction(id, button) {
-        $(id).value = button.id;
+    window.setCacheAction = function(id, button) {
+        document.getElementById(id).value = button.id;
+
         configForm.submit();
     }
     </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -34,7 +34,7 @@ $_colspan = $this->isAddAfter() ? 2 : 1;
     <input type="hidden" name="<?php echo $this->getElement()->getName(); ?>[__empty]" value="" />
 
     <script>
-
+        require(['prototype'], function(){
         // create row creator
         var arrayRow<?php echo $_htmlId ?> = {
 
@@ -114,6 +114,6 @@ $_colspan = $this->isAddAfter() ? 2 : 1;
         <?php if ($this->getElement()->getDisabled()):?>
         toggleValueElements({checked: true}, $('grid<?php echo $_htmlId; ?>').parentNode);
             <?php endif;?>
-
+        });
     </script>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/js.phtml
@@ -5,7 +5,10 @@
  */
 ?>
 <script>
-//<![CDATA[
+require([
+    'prototype'
+], function () {
+
 var freeModel = Class.create();
 freeModel.prototype = {
     initialize : function()
@@ -233,8 +236,8 @@ function showHint() {
         });
     });
 }
-Event.observe(window, 'load', function(){
-    showHint();
+
+Event.observe(window, 'load', showHint);
+
 });
-//]]>
 </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml
@@ -5,7 +5,10 @@
  */
 ?>
 <script>
-//<![CDATA[
+require([
+    'prototype'
+], function () {
+
 var CountryModel = Class.create();
 CountryModel.prototype = {
     initialize : function()
@@ -108,5 +111,5 @@ CountryModel.prototype = {
 
 }
 countryApply = new CountryModel();
-//]]>
+});
 </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/variable/js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/variable/js.phtml
@@ -5,9 +5,11 @@
  */
 ?>
 <script>
-//<![CDATA[
+require([
+    'prototype'
+], function () {
 
-function toggleValueElement(element) {
+window.toggleValueElement = function(element) {
     var disabled = false;
     if (element.value == 1) {
         // use default value
@@ -24,5 +26,5 @@ function toggleValueElement(element) {
     }
 }
 
-//]]>
+});
 </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -49,11 +49,13 @@ document.getElementById("gallery_thead").style.visibility="hidden";
 </tbody></table>
 
 <script>
-//<![CDATA[
+require([
+    'prototype'
+], function () {
 id = 0;
 num_of_images = <?php echo $i ?>;
 
-function addNewImage()
+window.addNewImage = function()
 {
 
     document.getElementById("gallery_thead").style.visibility="visible";
@@ -102,7 +104,7 @@ function addNewImage()
 
 }
 
-function deleteImage(image)
+window.deleteImage = function(image)
 {
     num_of_images--;
     if (num_of_images<=0) {
@@ -115,8 +117,7 @@ function deleteImage(image)
         image.parentNode.parentNode.parentNode.removeChild( image.parentNode.parentNode );
     }
 }
-//]]>
-
+});
 </script>
     </td>
 </tr>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
@@ -13,17 +13,22 @@
 <?php $formId = $this->getFormId()?>
 <?php if (!empty($formId)) :?>
 <script>
-    Event.observe(window, "load", function(){
-        var serializeInput  = document.createElement('input');
-        serializeInput.type = 'hidden';
-        serializeInput.name = '<?php echo $this->getInputElementName()?>';
-        serializeInput.id   = '<?php echo $_id?>';
-        try {
-            document.getElementById('<?php echo $formId?>').appendChild(serializeInput);
-            new serializerController('<?php echo $_id?>', <?php echo $this->getDataAsJSON() ?>, <?php echo $this->getColumnInputNames(true) ?>, <?php echo $this->getGridBlock()->getJsObjectName() ?>, '<?php echo $this->getReloadParamName()?>');
-        } catch(e) {
-            //Error add serializer
-        }
+    require([
+        'prototype',
+        'mage/adminhtml/grid'
+    ], function(){
+        Event.observe(window, "load", function(){
+            var serializeInput  = document.createElement('input');
+            serializeInput.type = 'hidden';
+            serializeInput.name = '<?php echo $this->getInputElementName()?>';
+            serializeInput.id   = '<?php echo $_id?>';
+            try {
+                document.getElementById('<?php echo $formId?>').appendChild(serializeInput);
+                new serializerController('<?php echo $_id?>', <?php echo $this->getDataAsJSON() ?>, <?php echo $this->getColumnInputNames(true) ?>, <?php echo $this->getGridBlock()->getJsObjectName() ?>, '<?php echo $this->getReloadParamName()?>');
+            } catch(e) {
+                //Error add serializer
+            }
+        });
     });
 </script>
 <?php else :?>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
@@ -25,7 +25,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     public function setValidationContainer($elementId, $containerId)
     {
         return '<script>
-            $(\'' .
+            document.getElementById(\'' .
             $elementId .
             '\').advaiceContainer = \'' .
             $containerId .
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
@@ -25,7 +25,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     public function setValidationContainer($elementId, $containerId)
     {
         return '<script>
-            $(\'' .
+            document.getElementById(\'' .
             $elementId .
             '\').advaiceContainer = \'' .
             $containerId .
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
@@ -25,7 +25,7 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     public function setValidationContainer($elementId, $containerId)
     {
         return '<script>
-            $(\'' .
+            document.getElementById(\'' .
             $elementId .
             '\').advaiceContainer = \'' .
             $containerId .
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
@@ -25,7 +25,7 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
     public function setValidationContainer($elementId, $containerId)
     {
         return '<script>
-            $(\'' .
+            document.getElementById(\'' .
             $elementId .
             '\').advaiceContainer = \'' .
             $containerId .
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -68,7 +68,7 @@ protected function _prepareForm()
             $tax->setAfterElementHtml(
                 '<script>' .
                 "
-                //<![CDATA[
+                require(['prototype'], function(){
                 function changeTaxClassId() {
                     if ($('price_type').value == '" .
                 \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC .
@@ -87,13 +87,11 @@ function changeTaxClassId() {
                     }
                 }
 
-                document.observe('dom:loaded', function() {
-                    if ($('price_type')) {
-                        $('price_type').observe('change', changeTaxClassId);
-                        changeTaxClassId();
-                    }
+                if ($('price_type')) {
+                    $('price_type').observe('change', changeTaxClassId);
+                    changeTaxClassId();
+                }
                 });
-                //]]>
                 " .
                 '</script>'
             );
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
@@ -54,11 +54,13 @@ public function getElementHtml()
 
         $html .= ' <label for="' . $htmlId . '" class="normal">' . __('Use Config Settings') . '</label>';
         $html .= '<script>' .
+            'require(["prototype"], function(){'.
             'toggleValueElements($(\'' .
             $htmlId .
             '\'), $(\'' .
             $htmlId .
             '\').parentNode);' .
+            '});'.
             '</script>';
 
         return $html;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
@@ -51,11 +51,11 @@ public function getElementHtml()
 
         $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
         $html .= ' <label for="' . $htmlId . '" class="normal">' . __('Use All Available Attributes') . '</label>';
-        $html .= '<script>toggleValueElements($(\'' .
+        $html .= '<script>require(["prototype"], function(){toggleValueElements($(\'' .
             $htmlId .
             '\'), $(\'' .
             $htmlId .
-            '\').parentNode);</script>';
+            '\').parentNode);});</script>';
 
         return $html;
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
@@ -51,11 +51,11 @@ public function getElementHtml()
 
         $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
         $html .= ' <label for="' . $htmlId . '" class="normal">' . __('Use Config Settings') . '</label>';
-        $html .= '<script>toggleValueElements($(\'' .
+        $html .= '<script>require(["prototype"], function(){toggleValueElements($(\'' .
             $htmlId .
             '\'), $(\'' .
             $htmlId .
-            '\').parentNode);</script>';
+            '\').parentNode);});</script>';
 
         return $html;
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/filter/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/filter/after.phtml
diff --git a/app/code/Magento/Msrp/Plugin/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Msrp/Plugin/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
diff --git a/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Import.php b/app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Import.php

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ protected function _getFooterHtml($element)`
`214`	`214`	`protected function _getExtraJs($element)`
`215`	`215`	`{`
`216`	`216`	`$htmlId = $element->getHtmlId();`
`217`		`- $output = "Fieldset.applyCollapse('{$htmlId}');";`
	`217`	`+ $output = "require(['prototype'], function(){Fieldset.applyCollapse('{$htmlId}');});";`
`218`	`218`	`return $this->_jsHelper->getScript($output);`
`219`	`219`	`}`
`220`	`220`