Skip to content

Commit 84a6d3b

Browse files
authored
[6.0] Move jquery-noconflict script (#45020)
Thank you @dgrammatiko and the testers @brianteeman and @Fedik Much appreciated
1 parent 95be2c1 commit 84a6d3b

File tree

4 files changed

+7
-18
lines changed

4 files changed

+7
-18
lines changed

build/build-modules-js/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,11 @@
432432
"name": "jquery",
433433
"type": "script",
434434
"uri": "jquery.min.js"
435+
},
436+
{
437+
"name": "jquery-noconflict",
438+
"type": "script",
439+
"uri": "jquery-noconflict.min.js"
435440
}
436441
],
437442
"dependencies": [],

build/media_source/legacy/joomla.asset.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

build/media_source/legacy/js/jquery-noconflict.es5.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// eslint-disable-next-line no-undef
2+
window.$ = jQuery.noConflict();

0 commit comments

Comments
 (0)