Skip to content

Commit

Permalink
Update jquery-ui to 1.13.3 and move jquery-ui and ui-contextmenu to p…
Browse files Browse the repository at this point in the history
…ackage.json (#7149)
  • Loading branch information
david-yz-liu authored Jul 24, 2024
1 parent 24cf017 commit 484caaa
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 1,717 deletions.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
- Switch from rails-sassc to cssbundling-rails for CSS asset management (#7121)
- Fixed flaky test #creates groups for individual students in groups_controller_spec (#7145)
- Switch from SyntaxHighlighter to Prism for syntax highlighting (#7122)
- Move jquery-ui and ui-contextmenu dependencies to package.json and upgrade jquery-ui to v1.13.3 (#7149)

## [v2.4.12]

Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/Results/context_menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
function properly, these dependencies are necessary:
Context-Menu and library related:
* jquery.ui-contextmenu.min.js (..\app\assets\javascripts\)
* ui-contextmenu
* Depends on jQuery and jQuery-ui
* context_menu.scss (..\app\assets\stylesheets\)
*/
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/Results/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// UI LIBRARIES
//= require DropDownMenu/DropDownMenu
//= require jquery.ui-contextmenu.min

// Source code highlighting
//= require Annotations/globals
Expand Down
2 changes: 2 additions & 0 deletions app/assets/javascripts/ajax_events.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import $ from "jquery";

import {FLASH_KEYS} from "./flash";

/*
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// the compiled file.
//
//= require jquery-ui

/** Helper functions for managing DOM elements' classes via pure JavaScript. */

Expand Down
4 changes: 3 additions & 1 deletion app/javascript/application_webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
import "mathjax/es5/tex-svg";

// jquery (should be the first to be loaded, as many other libs depend on it)
import $ from "jquery/src/jquery";
import $ from "jquery";
window.$ = window.jQuery = $;
import "jquery-ui/dist/jquery-ui";
import "ui-contextmenu";

// Callbacks for AJAX events (both jQuery and ujs).
import * as ajax_events from "javascripts/ajax_events";
Expand Down
36 changes: 35 additions & 1 deletion package-lock.json

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

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"i18n-js": "^4.4.3",
"jcrop": "^0.0.1",
"jquery": "^3.7.1",
"jquery-ui": "^1.13.3",
"marked": "^12.0.2",
"mathjax": "^3.2.2",
"mime": "^3.0.0",
Expand All @@ -35,7 +36,8 @@
"react-modal": "^3.16.1",
"react-table": "^6.11.5",
"react-tabs": "^4.3.0",
"tslib": "^2.6.3"
"tslib": "^2.6.3",
"ui-contextmenu": "^1.18.1"
},
"devDependencies": {
"@babel/core": "^7.24.7",
Expand Down
13 changes: 0 additions & 13 deletions vendor/assets/javascripts/jquery-ui.js

This file was deleted.

Loading

0 comments on commit 484caaa

Please sign in to comment.