opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into viz-staging

Browse Source
This commit is contained in:
Dannon Baker
2018-03-27 13:49:19 -04:00
parent c12feecb76 c5beedef6b
commit 70915dfc9f
106 changed files with 1433 additions and 1220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/scatterplot/templates/scatterplot.mako
-4
View File
@@ -26,9 +26,6 @@ ${h.stylesheet_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
<script type="text/javascript">
window.Galaxy = { root: '${ root }' };
</script>
${h.js( 'libs/jquery/jquery',
'libs/underscore',
'libs/d3')}
${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterplot.js' )}
<script type="text/javascript">
@@ -42,7 +39,6 @@ ${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
function getHDAJSON(){
return ${h.dumps( trans.security.encode_dict_ids( hda.to_dict() ), indent=2 )};
}
window.jQuery = window.jquery = window.$;
</script>
</head>