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

Replaced jStorage with store #6994

Merged
merged 4 commits into from Nov 9, 2018
Merged

Replaced jStorage with store #6994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4add47b
Replaced jStorage with store
Nerdinacan Nov 9, 2018
fc66e88
Update jquery.custom.js
Nerdinacan Nov 9, 2018
f8d5082
Removed debugger statement
Nerdinacan Nov 9, 2018
a64fa50
Merge branch 'replace_jstorage' of https://github.com/Nerdinacan/gala…
Nerdinacan Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions client/galaxy/scripts/apps/extended.js
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ export { create_chart, create_histogram } from "reports/run_stats";
export { default as ToolshedGroups } from "toolshed/toolshed.groups";

export { chart, chartUtilities } from "./chart";
export { default as store } from "store";

// TODO: update this when galaxy singleton code is merged
if (window.Galaxy && window.Galaxy.debug === undefined) {
Expand Down
1 change: 0 additions & 1 deletion client/galaxy/scripts/galaxy.pages.js
View file
Open in desktop
@@ -1,6 +1,5 @@
import _l from "utils/localization";
import "libs/jquery/jquery.form";
import "libs/jquery/jstorage";
import "libs/jquery/jquery.wymeditor";
import "libs/jquery/jquery.autocomplete";
import GridView from "mvc/grid/grid-view";
Expand Down
5 changes: 2 additions & 3 deletions client/galaxy/scripts/libs/jquery.custom.js
View file
Open in desktop
@@ -1,6 +1,6 @@
/**
* jQuery and all its horrible plugins. Bundled together and repackaged into a
* single module, then aliased by webpack as "jquery";
* single module, then aliased by webpack as "jquery"
*/

var jQuery = require("jqueryVendor");
Expand All @@ -14,11 +14,10 @@ require("imports-loader?jQuery=jqueryVendor!libs/jquery/jquery.form");
require("imports-loader?jQuery=jqueryVendor!libs/jquery/jquery.rating");
require("imports-loader?jQuery=jqueryVendor!libs/jquery/select2");
require("imports-loader?jQuery=jqueryVendor!libs/jquery/jquery-ui");
require("imports-loader?jQuery=jqueryVendor!libs/jquery/jstorage");
require("imports-loader?jQuery=jqueryVendor!libs/farbtastic");
require("imports-loader?jQuery=jqueryVendor,$=jqueryVendor,define=>false!jquery.cookie");
require("imports-loader?jQuery=jqueryVendor!libs/jquery/jquery.dynatree");
require("imports-loader?jQuery=jqueryVendor!jquery.complexify");
require("imports-loader?jQuery=jqueryVendor!jquery-migrate");

module.exports = jQuery;
module.exports = jQuery;