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

Library cleanup, jQuery removals [ cofest ] #18451

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions client/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const xml2js = require("xml2js");
* un-built visualizations in the repository; for performance and
* simplicity just add them one at a time until we upgrade older viz's.
*/
const STATIC_PLUGIN_BUILD_IDS = [
const PLUGIN_BUILD_IDS = [
"annotate_image",
"chiraviz",
"cytoscape",
Expand Down Expand Up @@ -40,9 +40,6 @@ const STATIC_PLUGIN_BUILD_IDS = [
"venn",
];
const INSTALL_PLUGIN_BUILD_IDS = ["msa"]; // todo: derive from XML
const DIST_PLUGIN_BUILD_IDS = ["new_user"];
const PLUGIN_BUILD_IDS = Array.prototype.concat(DIST_PLUGIN_BUILD_IDS, STATIC_PLUGIN_BUILD_IDS);

const failOnError =
process.env.GALAXY_PLUGIN_BUILD_FAIL_ON_ERROR && process.env.GALAXY_PLUGIN_BUILD_FAIL_ON_ERROR !== "0"
? true
Expand All @@ -54,12 +51,9 @@ const PATHS = {
// This is a stepping stone towards having all this staged
// automatically. Eventually, this dictionary and staging step will
// not be necessary.
backbone: ["backbone.js", "backbone.js"],
jquery: ["dist/jquery.js", "jquery/jquery.js"],
"jquery-migrate": ["dist/jquery-migrate.js", "jquery/jquery.migrate.js"],
"jquery-mousewheel": ["jquery.mousewheel.js", "jquery/jquery.mousewheel.js"],
requirejs: ["require.js", "require.js"],
underscore: ["underscore.js", "underscore.js"],
},
};

Expand Down Expand Up @@ -118,11 +112,7 @@ function buildPlugins(callback, forceRebuild) {
const pluginDir = path.dirname(file);
const pluginName = pluginDir.split(path.sep).pop();

const hashFilePath = path.join(
pluginDir,
DIST_PLUGIN_BUILD_IDS.indexOf(pluginName) > -1 ? "dist" : "static",
"plugin_build_hash.txt"
);
const hashFilePath = path.join(pluginDir, "static", "plugin_build_hash.txt");

if (forceRebuild) {
skipBuild = false;
Expand Down
2 changes: 0 additions & 2 deletions client/src/components/Collections/ListCollectionCreator.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import "ui/hoverhighlight";

import { library } from "@fortawesome/fontawesome-svg-core";
import { faSortAlphaDown, faUndo } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
Expand Down
3 changes: 0 additions & 3 deletions client/src/legacy/grid/grid-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,6 @@ export default Backbone.View.extend({
update_checked();
});

// Initialize ratings.
if (this.$el.find(".community_rating_star").length !== 0) this.$el.find(".community_rating_star").rating({});

// get options
var options = this.grid.attributes;
var self = this;
Expand Down
8 changes: 0 additions & 8 deletions client/src/libs/jquery.custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,13 @@ var jQuery = require("jqueryVendor");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/jquery.autocomplete");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/jquery.event.hover");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/jquery.event.drag");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/jquery.event.drop");
// TODO: replace mousewheel events
// require("imports-loader?imports=default|jquery|jqueryVendor,define=>false!jquery-mousewheel");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/jquery.form");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/jquery.rating");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/select2");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/jquery-ui");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/farbtastic");
// TODO: ensure unused
//require("imports-loader?imports=default|jquery|jqueryVendor,define=>false!jquery.cookie");
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery/jquery.dynatree");
require("imports-loader?imports=default|jqueryVendor|jQuery!jquery-migrate");

// require("imports-loader?jQuery=jqueryVendor!../ui/autocom_tagging");

// Only used in reports
require("imports-loader?imports=default|jqueryVendor|jQuery!libs/jquery.sparklines");

Expand Down
Loading
Loading