Remove jQuery dependency #1756
Merged
Remove jQuery dependency #1756
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aestoltm
added
the
maintenance / code quality
jpwhite4
reviewed
Sep 8, 2023
* Updating XDMoD to 11.0 Version Number Updates This commit contains the changes required to bring XDMoD up to 11.0 and includes: - Updated `xdmod-upgrade` $supportedUpgrades to 10.5.0 -> 11.0.0 - Removed all the previous ConfigFileMigration classes for the 10.X.X releases of XDMoD. - Updated `portal_settings.ini` version = 11.0.0 - Updated `docs/_config.yml` [sw|prev_sw]_version to 10.5.0 and 11.0.0 - Updated build.json version number to 11.0.0 - Added a Version1050To1100 ConfigFilesMigration.php - Added an ETL xdmod-migration-10_5_0-11_0_0 migration file. - Also updated the docker image used for building to xdmod10.5 * Removing el7 composer files Since we no longer support el7 w/ this release I've removed the el7 composer files and renamed the el8 files to just composer.json. I've also updated the circleci config file to take this change into account.
6 tasks
6 tasks
jpwhite4
requested changes
May 10, 2024
html/gui/js/modules/Usage.js
Outdated
| chartOptions.exporting.enabled = false; | ||
| chartOptions.credits.enabled = true; | ||
|
|
||
| this.chart = XDMoD.utils.createChart(chartOptions); | ||
| this.chartId = id; | ||
| this.chartOptions = chartOptions; | ||
| var chartDiv = document.getElementById(baseChartOptions.renderTo); | ||
| var chartDiv = document.getElementById(chartOptions.renderTo); |
There was a problem hiding this comment.
Please can you double check that this should be changed here.
html/gui/js/modules/Usage.js
Outdated
| @@ -1510,7 +1510,7 @@ Ext.extend(XDMoD.Module.Usage, XDMoD.PortalModule, { | |||
| if (chartRecords.length > 0) { | |||
| chartOptions = chartRecords[0].get('hc_jsonstore'); | |||
| } | |||
| jQuery.extend(true, chartOptions, baseChartOptions); | |||
| chartOptions = XDMoD.utils.deepExtend({}, baseChartOptions, chartOptions); | |||
There was a problem hiding this comment.
The function arguments are in a different order here. Please can you check this is intended (elsewhere you have kept the same order).
| found = false; | ||
| for (var i = 0; i < filters.length; i++) { | ||
| var filters = XDMoD.utils.deepExtend({}, record.get('filters')); | ||
| var found = false; |
There was a problem hiding this comment.
Suggested change
| var found = false; | |
| let found = false; |
jpwhite4
approved these changes
May 14, 2024
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Removing jQuery dependency by replacing
jQuery.extend()with solutions provided with modern browsers. This PR is a continuation of PR #1542.Dependent on PR #1785 so qa-tests will not receive a parsing error on arrow syntax.
Motivation and Context
jQuery is a large dependency that we use very sparingly.
Tests performed
Checklist: