UI: move base-mvc, annotation and tag editors, user model and quotameter to AMD; fix loading order and currUser in masthead, view, history; remove loggable mixin from scatterplot

This commit is contained in:
Carl Eberhard
2014-03-20 16:52:06 -04:00
parent f8a48b17ba
commit b5f5397a38
33 changed files with 154 additions and 123 deletions
@@ -29,7 +29,7 @@ todo:
* configuring which data will be used
* configuring the plot display
*/
var ScatterplotConfigEditor = Backbone.View.extend( LoggableMixin ).extend({
var ScatterplotConfigEditor = Backbone.View.extend({
//TODO: !should be a view on a visualization model
//logger : console,
className : 'scatterplot-control-form',
@@ -39,13 +39,13 @@ var ScatterplotConfigEditor = Backbone.View.extend( LoggableMixin ).extend({
if( !this.model ){
this.model = new Visualization({ type: 'scatterplot' });
}
this.log( this + '.initialize, attributes:', attributes );
//this.log( this + '.initialize, attributes:', attributes );
if( !attributes || !attributes.dataset ){
throw new Error( "ScatterplotConfigEditor requires a dataset" );
}
this.dataset = attributes.dataset;
this.log( 'dataset:', this.dataset );
//this.log( 'dataset:', this.dataset );
this.display = new ScatterplotDisplay({
dataset : attributes.dataset,