MAGETWO-32494: Remove jQuery JS library from main page header in the …

…frontend - Move jquery.js to lib/web root folder - Remove from a page header on frontend area - Add missing dependencies to jQuery library
magento · Jan 13, 2015 · 98214d7 · 98214d7
1 parent 1d3e0c8
commit 98214d7
Show file tree

Hide file tree

Showing 26 changed files with 78 additions and 77 deletions.
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -13,7 +13,7 @@
         <css src="mage/calendar.css"/>
         <link src="requirejs/require.js"/>
         <link src="mage/requirejs/resolver.js"/>
-        <link src="jquery/jquery.js"/>
+        <link src="jquery.js"/>
         <css src="extjs/resources/css/ext-all.css"/>
         <css src="extjs/resources/css/ytheme-magento.css"/>
     </head>

diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -71,8 +71,7 @@ require([
     'Magento_Ui/js/lib/registry/registry',
     'jquery/file-uploader',
     'mage/mage',
-    'prototype',
-
+    'prototype'
 ], function(jQuery, registry){
     registry.get('downloadable', function (Downloadable) {
         var linkTemplate = '<tr>'+

diff --git a/app/code/Magento/Review/view/frontend/templates/review.phtml b/app/code/Magento/Review/view/frontend/templates/review.phtml
@@ -8,46 +8,49 @@
 <div id="product-review-container"></div>
 <?php echo $this->getChildHtml(); ?>
 
-<script type="text/javascript">
-//<![CDATA[
-function processReviews(url,fromPages) {
-(function($) {
-    $.ajax({
-        url: url,
-        dataType: 'html'
-    }).done(function(data) {
-        $('#product-review-container').html(data);
-        $('.pages a').each(function(index, element) {
-            $(element).click(function(event) {
-                processReviews($(element).attr('href'), true);
-                event.preventDefault();
+<script>
+    require([
+        'jquery'
+    ], function ($) {
+
+        function processReviews(url, fromPages) {
+            $.ajax({
+                url: url,
+                dataType: 'html'
+            }).done(function (data) {
+                $('#product-review-container').html(data);
+                $('.pages a').each(function (index, element) {
+                    $(element).click(function (event) {
+                        processReviews($(element).attr('href'), true);
+                        event.preventDefault();
+                    });
+                });
+            }).complete(function () {
+                if (fromPages == true) {
+                    $('html, body').animate({
+                        scrollTop: $('#reviews').offset().top - 50
+                    }, 300);
+                }
             });
-        });
-    }).complete(function(){
-        if (fromPages == true) {
-            $('html, body').animate({
-                scrollTop: $('#reviews').offset().top - 50
-            }, 300);
         }
-    });
-})(jQuery);
-}
-processReviews('<?php echo $this->getProductReviewUrl();?>');
 
-jQuery(function() {
-    jQuery('.product-info-main .reviews-actions a').click(function(event) {
-        event.preventDefault();
-        var acnchor = jQuery(this).attr('href').replace(/^.*?(#|$)/,'');
-        jQuery(".product.data.items [data-role='content']").each(function(index){
-            if(this.id == "reviews") {
-                jQuery(".product.data.items").tabs('activate',index);
-                jQuery('html, body').animate({
-                    scrollTop: jQuery('#' + acnchor).offset().top - 50
-                }, 300);
-            }
-        })
-    })
-});
+        processReviews('<?php echo $this->getProductReviewUrl();?>');
 
-//]]>
+        $(function () {
+            $('.product-info-main .reviews-actions a').click(function (event) {
+                event.preventDefault();
+                var acnchor = $(this).attr('href').replace(/^.*?(#|$)/, '');
+                $('.product.data.items [data-role='
+                    content ']').each(function (index) {
+                    if (this.id == 'reviews') {
+                        $('.product.data.items').tabs('activate', index);
+                        $('html, body').animate({
+                            scrollTop: $('#' + acnchor).offset().top - 50
+                        }, 300);
+                    }
+                });
+            });
+        });
+
+    });
 </script>
diff --git a/app/code/Magento/Theme/view/adminhtml/requirejs-config.js b/app/code/Magento/Theme/view/adminhtml/requirejs-config.js
@@ -33,7 +33,6 @@ var config = {
     },
     "deps": [
         "js/theme",
-        "jquery/jquery-migrate",
         "mage/dropdown_old",
         "mage/backend/bootstrap"
     ],
@@ -42,6 +41,6 @@ var config = {
     }
 };
 
-require(['jquery'], function(jQuery){
+require(['jquery'], function (jQuery) {
     jQuery.noConflict();
 });
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -6,6 +6,7 @@
 var config = {
     "waitSeconds": "0",
     "shim": {
+        "jquery/jquery-migrate": ["jquery"],
         "jquery/jquery.hashchange": ["jquery"],
         "jquery/jquery.mousewheel": ["jquery"],
         "jquery/jquery.popups": ["jquery"],
@@ -37,5 +38,8 @@ var config = {
         "text": "requirejs/text",
         "domReady": "requirejs/domReady",
         "ko": "ko/ko"
-    }
+    },
+    "deps": [
+        "jquery/jquery-migrate"
+    ]
 };
diff --git a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
@@ -11,11 +11,6 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"/>
         <css src="mage/calendar.css"/>
         <script src="requirejs/require.js"/>
-        <!-- /**
-        TODO: remove jQuery. jQuery could be loaded through RequireJS. But only in case ALL MODULES ARE AMD MODULES.
-        Detail: http://requirejs.org/docs/jquery.html#noconflictmap
-        */ -->
-        <script src="jquery/jquery.js"/>
     </head>
     <body>
         <referenceContainer name="after.body.start">

diff --git a/app/code/Magento/Theme/view/frontend/requirejs-config.js b/app/code/Magento/Theme/view/frontend/requirejs-config.js
@@ -36,8 +36,6 @@ var config = {
         "jquery/ui": "jquery/jquery-ui"
     },
     deps: [
-        "jquery",
-        "jquery/jquery-migrate",
         "jquery/jquery.mobile.custom",
         "js/responsive",
         "mage/common",

diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
@@ -25,7 +25,7 @@
     <script src="<?php echo $this->getViewFileUrl('mage/captcha.js') ?>"></script>
 
     <script src="<?php echo $this->getViewFileUrl('requirejs/require.js') ?>"></script>
-    <script src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>
+    <script src="<?php echo $this->getViewFileUrl('jquery.js') ?>"></script>
     <script src="<?php echo $this->getViewFileUrl('Magento_User::app-config.js') ?>"></script>
     <?php echo $this->getChildHtml('requirejs-config');?>
 

diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
@@ -24,7 +24,7 @@
     <script src="<?php echo $this->getViewFileUrl('mage/captcha.js') ?>"></script>
 
     <script src="<?php echo $this->getViewFileUrl('requirejs/require.js') ?>"></script>
-    <script src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>
+    <script src="<?php echo $this->getViewFileUrl('jquery.js') ?>"></script>
     <script src="<?php echo $this->getViewFileUrl('Magento_User::app-config.js') ?>"></script>
     <?php echo $this->getChildHtml('requirejs-config');?>
 

diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -43,7 +43,11 @@
                 </div>
             <?php else: ?>
                 <script>
-                    jQuery('#layered-filter-block').addClass('filter-no-options');
+                    require([
+                        'jquery'
+                    ], function ($) {
+                        $('#layered-filter-block').addClass('filter-no-options');
+                    });
                 </script>
             <?php endif; ?>
         </div>

diff --git a/composer.json b/composer.json
@@ -166,7 +166,7 @@
             "linkorb/jsmin-php": "lib/internal/JSMin",
             "phpseclib/phpseclib": "lib/internal/phpseclib",
             "components/jquery": [
-                "lib/web/jquery/jquery.js",
+                "lib/web/jquery.js",
                 "lib/web/jquery/jquery.min.js",
                 "lib/web/jquery/jquery-migrate.js",
                 "lib/web/jquery/jquery-migrate.min.js"

diff --git a/dev/tests/js/jsTestDriverOrder.php b/dev/tests/js/jsTestDriverOrder.php
@@ -9,7 +9,7 @@
  * @return array
  */
 return [
-    '/lib/web/jquery/jquery.js',
+    '/lib/web/jquery.js',
     '/lib/web/jquery/jquery-migrate.js',
     '/lib/web/jquery/jquery-ui-1.9.2.js',
     '/dev/tests/js/framework/requirejs-util.js',

diff --git a/dev/tests/js/testsuite/lib/ko/datepicker/index.html b/dev/tests/js/testsuite/lib/ko/datepicker/index.html
@@ -14,7 +14,7 @@
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery/jquery.js"></script>
+    <script src="../../../pub/lib/jquery.js"></script>
     <script src="../../../pub/moment.js"></script>
     <script src="../../../pub/lib/ko/ko.js"></script>
     <script type="text/javascript" src="testsuite/lib/ko/datepicker/datepicker.js"></script>

diff --git a/dev/tests/js/testsuite/lib/storage/index.html b/dev/tests/js/testsuite/lib/storage/index.html
@@ -14,7 +14,7 @@
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery/jquery.js"></script>
+    <script src="../../../pub/lib/jquery.js"></script>
     <script src="../../../pub/lib/jquery/jquery-ui.js"></script>
     <script src="../../../pub/lib/jquery/jquery.cookie.js"></script>
     <script src="../../../pub/lib/lib/storage.js"></script>

diff --git a/dev/tests/js/testsuite/mage/accordion/index.html b/dev/tests/js/testsuite/mage/accordion/index.html
@@ -14,7 +14,7 @@
     <title>Accordion Widget: QUnit Tests </title>
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="../../../pub/lib/jquery/jquery.js"></script>
+    <script type="text/javascript" src="../../../pub/lib/jquery.js"></script>
     <script type="text/javascript" src="../../../pub/lib/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
     <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>

diff --git a/dev/tests/js/testsuite/mage/calendar/calendar.html b/dev/tests/js/testsuite/mage/calendar/calendar.html
@@ -14,7 +14,7 @@
   <title>Calendar Widget: QUnit Tests </title>
 	<base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="../../../lib/web/jquery/jquery.js"></script>
+    <script type="text/javascript" src="../../../lib/web/jquery.js"></script>
     <script type="text/javascript" src="../../../lib/web/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="../../../lib/web/jquery/jquery-ui-timepicker-addon.js"></script>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>

diff --git a/dev/tests/js/testsuite/mage/collapsible/index.html b/dev/tests/js/testsuite/mage/collapsible/index.html
@@ -15,7 +15,7 @@
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery/jquery.js"></script>
+    <script src="../../../pub/lib/jquery.js"></script>
     <script src="../../../pub/lib/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
     <script type="text/javascript" src="../../../pub/lib/mage/collapsible.js"></script>

diff --git a/dev/tests/js/testsuite/mage/dropdown/index.html b/dev/tests/js/testsuite/mage/dropdown/index.html
@@ -14,7 +14,7 @@
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../lib/web/jquery/jquery.js"></script>
+    <script src="../../../lib/web/jquery.js"></script>
     <script src="../../../lib/web/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="../../../lib/web/mage/mage.js"></script>
     <script type="text/javascript" src="../../../lib/web/mage/dropdown.js"></script>

diff --git a/dev/tests/js/testsuite/mage/list/index.html b/dev/tests/js/testsuite/mage/list/index.html
@@ -11,7 +11,7 @@
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery/jquery.js"></script>
+    <script src="../../../pub/lib/jquery.js"></script>
     <script src="../../../pub/lib/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
     <script type="text/javascript" src="../../../pub/lib/jquery/handlebars/handlebars-v1.3.0.js"></script>

diff --git a/dev/tests/js/testsuite/mage/loader/loader.html b/dev/tests/js/testsuite/mage/loader/loader.html
@@ -10,7 +10,7 @@
     <title>Unit test</title>
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script src="../../../lib/web/jquery/jquery.js"></script>
+    <script src="../../../lib/web/jquery.js"></script>
     <script src="../../../lib/web/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
     <script type="text/javascript" src="../../../lib/web/mage/mage.js"></script>

diff --git a/dev/tests/js/testsuite/mage/menu/index.html b/dev/tests/js/testsuite/mage/menu/index.html
@@ -14,7 +14,7 @@
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../pub/lib/jquery/jquery.js"></script>
+    <script src="../../../pub/lib/jquery.js"></script>
     <script src="../../../pub/lib/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>
     <script type="text/javascript" src="../../../pub/lib/mage/menu.js"></script>

diff --git a/dev/tests/js/testsuite/mage/tabs/index.html b/dev/tests/js/testsuite/mage/tabs/index.html
@@ -11,7 +11,7 @@
     <title>Tabs Widget: QUnit Tests </title>
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
-    <script type="text/javascript" src="../../../pub/lib/jquery/jquery.js"></script>
+    <script type="text/javascript" src="../../../pub/lib/jquery.js"></script>
     <script type="text/javascript" src="../../../pub/lib/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
     <script type="text/javascript" src="../../../pub/lib/mage/mage.js"></script>

diff --git a/dev/tests/js/testsuite/mage/validation/index.html b/dev/tests/js/testsuite/mage/validation/index.html
@@ -14,7 +14,7 @@
     <base href="../../../"/>
     <link type="text/css" rel="stylesheet" href="framework/qunit/qunit-1.14.0.css"/>
     <script type="text/javascript" src="framework/qunit/qunit-1.14.0.js"></script>
-    <script src="../../../lib/web/jquery/jquery.js"></script>
+    <script src="../../../lib/web/jquery.js"></script>
 
     <script src="../../../lib/web/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="../../../lib/web/mage/mage.js"></script>

diff --git a/lib/web/jquery/jquery.js → lib/web/jquery.js b/lib/web/jquery/jquery.js → lib/web/jquery.js
diff --git a/lib/web/jquery/jquery.min.js b/lib/web/jquery/jquery.min.js
diff --git a/lib/web/mage/common.js b/lib/web/mage/common.js
@@ -3,9 +3,12 @@
  * See COPYING.txt for license details.
  */
 /*jshint browser:true jquery:true*/
-jQuery(function ($) {
-    $(document).ready(function(){
-        /* Form with auto submit feature */
-        $('form[data-auto-submit="true"]').submit();
-    });
-});
+define([
+    'jquery',
+    'domReady'
+], function ($) {
+    'use strict';
+
+    /* Form with auto submit feature */
+    $('form[data-auto-submit="true"]').submit();
+});