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.

Sign up for GitHub

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

Jump to bottom

[6.0] Move jquery-noconflict script #45020

Merged
merged 6 commits into from
Mar 4, 2025
Merged

[6.0] Move jquery-noconflict script #45020

merged 6 commits into from
Mar 4, 2025
+7 −18

Conversation

dgrammatiko
Copy link
Contributor

Pull Request for Issue # .

Summary of Changes

  • Move jquery-noconflict script to the appropriate folder media/vendor/jquery/js

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:

  • No documentation changes for docs.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

Sorry, something went wrong.

@dgrammatiko
move jquery-noconflict
Loading
Loading status checks…
ac225bb
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-6.0-dev labels Feb 26, 2025
@Fedik
Copy link
Member

Fedik commented Feb 27, 2025

I have tested this item ✅ successfully on ac225bb

This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/45020.

@brianteeman
Copy link
Contributor

I have tested this item 🔴 unsuccessfully on ac225bb

after applying the pr and then npm i I expected to find the jquery-noconflict.js in the media/vendor/jquery folder but it was not there even though thats where media\vendor\joomla.asset.json says it should be

This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/45020.

@dgrammatiko
it’s es6 not esm!!!
Loading
Loading status checks…
64307f0
@dgrammatiko
Copy link
Contributor Author

@brianteeman thanks, somehow I used .esm.js instead of .es6.js

@brianteeman
Copy link
Contributor

I have tested this item ✅ successfully on ac225bb

real tests produce real results

This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/45020.

@dgrammatiko
Update jquery-noconflict.es6.js
Loading
Loading status checks…
34e8748
@richard67
Copy link
Member

@dgrammatiko Could you fix the linter error reported here? https://ci.joomla.org/joomla/joomla-cms/82752/1/20 Thanks in advance.

@richard67
Copy link
Member

richard67 commented Feb 28, 2025 •
edited
Loading

Restoring @brianteeman 's test result in the issue tracker as the commit which has invalidated the test count was just a linter hint.

@Fedik Could you test again? After your test a relevant change had been made: 64307f0

@Fedik
Copy link
Member

Fedik commented Feb 28, 2025

I have tested this item ✅ successfully on f368dfa

Still looks good to me :)

This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/45020.

@richard67 richard67 changed the title [6.0] Move jquery-noconflict script [6.0] Move jquery-noconflict script Feb 28, 2025
@richard67
Copy link
Member

RTC

This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/45020.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Feb 28, 2025
@softforge softforge merged commit 84a6d3b into joomla:6.0-dev Mar 4, 2025
3 checks passed
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Mar 4, 2025
@softforge softforge added this to the Joomla! 6.0.0 milestone Mar 4, 2025
richard67 added a commit to richard67/joomla-cms that referenced this pull request Mar 4, 2025
@richard67
Add deleted files and folders from PRs joomla#44240 and joomla#45020
a0efefd
@richard67 richard67 mentioned this pull request Mar 4, 2025
Open
4 tasks
@laoneo
Copy link
Member

laoneo commented Mar 4, 2025

If this file is on a new location after the upgrade to 6, then it should be documented in the upgrade guide here.

@dgrammatiko
Copy link
Contributor Author

I will, although the entry is used in the joomla.assets.json, it shouldn't be used directly

@dgrammatiko dgrammatiko deleted the 6.0-dev/jquery-noconflict branch March 4, 2025 09:42
@dgrammatiko dgrammatiko mentioned this pull request Mar 4, 2025
Open
@dgrammatiko
Copy link
Contributor Author

joomla/Manual#426

voronkovich pushed a commit to PopArtDesign/joomla-cms that referenced this pull request Mar 4, 2025
@dgrammatiko @voronkovich
[6.0] Move jquery-noconflict script (joomla#45020)
5eeb9fb 
Thank you @dgrammatiko and the testers @brianteeman and @Fedik Much appreciated
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Enhancement NPM Resource Changed This Pull Request can't be tested by Patchtester PR-6.0-dev
Projects
None yet
Milestone
Joomla! 6.0.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@dgrammatiko @Fedik @brianteeman @richard67 @laoneo @softforge @joomla-cms-bot @QuyTon