jquery-ui does not like loading. jquery-ui-bundle handles this better, can easily be used as an import (we probably want to get rid of this stuff eventually, but it works for now)

This commit is contained in:
Dannon Baker
2017-12-04 08:46:03 -05:00
parent 3a532ad8e8
commit 2083ce9ea0
6 changed files with 15 additions and 3 deletions
@@ -1,7 +1,9 @@
import * as VisualizationModel from "mvc/visualization/visualization-model";
import * as bootstrap from "bootstrap";
import * as Backbone from "libs/backbone";
import "jquery-ui-bundle";
import * as d3 from "libs/d3";
import "ui/peek-column-selector";
/**
* Two Variable scatterplot visualization using d3
@@ -24,7 +24,6 @@ ${h.stylesheet_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
## ----------------------------------------------------------------------------
<script type="text/javascript">
// TODO: blah
window.Galaxy = { root: '${ root }' };
</script>
${h.js( 'libs/jquery/jquery',
@@ -66,8 +65,6 @@ ${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
embedded: "${embedded}"
}).render();
display.fetchData();
//window.model = model;
//window.display = display;
});
</script>
@@ -17,6 +17,13 @@ module.exports = {
backbone: path.join(lroot, "backbone.js"),
}
},
resolveLoader: {
alias: {
// since we support both requirejs i18n and non-requirejs and both use a similar syntax,
// use an alias so we can just use one file
i18n: "amdi18n-loader"
}
},
module: {
rules: [
{