Client: remove older compiled backbone/backbone.js, update scatterplot and charts for same; Visualizations: fix visualization-model url; Scatterplot: fix title bug and Galaxy var

This commit is contained in:
carlfeberhard
2016-01-21 13:38:12 -05:00
parent fe96255022
commit f5fbe1c502
9 changed files with 18 additions and 17 deletions
@@ -23,12 +23,16 @@ ${h.css( 'base', 'jquery-ui/smoothness/jquery-ui')}
${h.stylesheet_link( root + 'plugins/visualizations/scatterplot/static/scatterplot.css' )}
## ----------------------------------------------------------------------------
<script type="text/javascript">
// TODO: blah
window.Galaxy = { root: '${ root }' };
</script>
${h.js( 'libs/jquery/jquery',
'libs/jquery/jquery.migrate',
'libs/jquery/jquery-ui',
'libs/bootstrap',
'libs/underscore',
'libs/backbone/backbone',
'libs/backbone',
'libs/d3',
'libs/handlebars.runtime',
'ui/peek-column-selector',
@@ -41,7 +45,7 @@ ${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
function getModel(){
return new ScatterplotModel({
id : ${h.dumps( visualization_id )} || undefined,
title : "${title}",
title : "${title or default_title}",
config : ${h.dumps( config, indent=2 )}
});
}
@@ -88,7 +92,7 @@ function getHDAJSON(){
hdaJSON = getHDAJSON(),
editor = new ScatterplotConfigEditor({
el : $( '.scatterplot-editor' ).attr( 'id', 'scatterplot-editor-hda-' + hdaJSON.id ),
model : getModel(),
model : model,
dataset : hdaJSON
}).render();
window.editor = editor;