1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/765236afce95/ Changeset: 765236afce95 User: jeremy goecks Date: 2014-03-09 17:51:16 Summary: Trackster preferences cleanup. Affected #: 1 file diff -r 4db68bf05fbf11f413b441544c77772a22a868b1 -r 765236afce9551bb8938d236e12ed5d90cbe2c54 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -208,7 +208,6 @@ // -- Set up drawable configuration. -- this.config = config_mod.ConfigSettingCollection.from_models_and_saved_values(this.config_params, obj_dict.prefs); - console.log(obj_dict.prefs); this.config.each(function(s) { console.log(s.id, s.get('value')) }) // If there's no saved name, use object name. @@ -875,7 +874,7 @@ initialize: function(obj_dict) { extend(obj_dict, { - obj_type: "View" + obj_type: "View" }); DrawableCollection.call(this, "View", obj_dict.container, obj_dict); this.chrom = null; @@ -895,16 +894,13 @@ this.reset(); // Define track configuration - this.config = new config_mod.ConfigSettingCollection({ - models: [ + this.config = config_mod.ConfigSettingCollection.from_models_and_saved_values( [ { key: 'a_color', label: 'A Color', type: 'color', default_value: "#FF0000" }, { key: 'c_color', label: 'C Color', type: 'color', default_value: "#00FF00" }, { key: 'g_color', label: 'G Color', type: 'color', default_value: "#0000FF" }, { key: 't_color', label: 'T Color', type: 'color', default_value: "#FF00FF" }, { key: 'n_color', label: 'N Color', type: 'color', default_value: "#AAAAAA" } - ], - saved_values: obj_dict.prefs, - }); + ], obj_dict.prefs); }, render: function() { @@ -1151,7 +1147,8 @@ }, get_base_color: function(base) { - return this.config.get('values')[ base.toLowerCase() + '_color' ] || this.config.get('values').n_color; + return this.config.get_value(base.toLowerCase() + '_color') || + this.config.get_value('n_color'); } }); @@ -3740,7 +3737,7 @@ }, set_painter_from_config: function() { - if ( this.config.get('values').connector_style === 'arcs' ) { + if ( this.config.get_value('connector_style') === 'arcs' ) { this.painter = painters.ArcLinkedFeaturePainter; } else { this.painter = painters.LinkedFeaturePainter; Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.