opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-01 15:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unify and expose all the jqueries.

Browse Source
This commit is contained in:
Dannon Baker
2017-09-19 12:08:41 -04:00
parent d1daca61b9
commit 08eccf5550
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/base.mako
+2 -1
View File
@@ -74,7 +74,8 @@
// configure require for base
// due to our using both script tags and require, we need to access the same jq in both for plugin retention
// source http://www.manuel-strehl.de/dev/load_jquery_before_requirejs.en.html
define( 'jquery', [], function(){ return $; })
window.jQuery = window.jquery = window.$;
define( 'jquery', [], function(){ return window.$; })
// TODO: use one system
// shims and paths
templates/base/base_panels.mako
+2 -1
View File
@@ -62,7 +62,8 @@
// source http://www.manuel-strehl.de/dev/load_jquery_before_requirejs.en.html
window.Galaxy = window.Galaxy || {};
window.Galaxy.root = '${h.url_for( "/" )}';
define( 'jquery', [], function(){ return $; })
window.jQuery = window.jquery = window.$;
define( 'jquery', [], function(){ return window.$; })
// TODO: use one system
// shims and paths