Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RWD theme: use jQuery via composer #4429

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
/app/etc/modules/Cm_RedisSession.xml
/lib/Credis

# jQuery library
/js/lib/jquery/jquery*

# TinyMCE library
/js/lib/tinymce

Expand Down
3 changes: 3 additions & 0 deletions app/code/core/Mage/Core/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,9 @@
<js>
<merge_files>0</merge_files>
</js>
<jquery>
<migrate>0</migrate>
</jquery>
</dev>
<system>
<csrf>
Expand Down
18 changes: 18 additions & 0 deletions app/code/core/Mage/Core/etc/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,24 @@
</merge_css_files>
</fields>
</css>
<jquery translate="label">
<label>jQuery Settings</label>
<sort_order>120</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<fields>
<migrate translate="label">
<label>Load jQuery-migration.js</label>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_yesno</source_model>
<sort_order>10</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</migrate>
</fields>
</jquery>
</groups>
</dev>
<general translate="label" module="core">
Expand Down
5 changes: 4 additions & 1 deletion app/design/frontend/rwd/default/layout/page.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@

<block type="page/html_head" name="head" as="head">
<action method="addJs"><script>prototype/prototype.js</script></action>
<action method="addJs"><script>lib/jquery/jquery-1.12.4.min.js</script></action>
<action method="addJs"><script>lib/jquery/jquery.min.js</script></action>
<action method="addJs" ifconfig="dev/jquery/migrate">
<script>lib/jquery/jquery-migrate.min.js</script>
</action>
<action method="addJs"><script>lib/jquery/noconflict.js</script></action>
<action method="addJs"><script>lib/ccard.js</script></action>
<action method="addJs"><script>prototype/validation.js</script></action>
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"ext-zlib": "*",
"colinmollenhour/cache-backend-redis": "^1.14",
"colinmollenhour/magento-redis-session": "^3.2.0",
"components/jquery": "1.12.4",
"cweagans/composer-patches": "^1.7",
"ezyang/htmlpurifier": "^4.17",
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
Expand Down
53 changes: 51 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading