1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7ecbf85f9181/ Changeset: 7ecbf85f9181 User: jgoecks Date: 2014-07-02 00:27:15 Summary: Fixes for Trackster and Circster, mostly around preference selection and usage. Affected #: 4 files
diff -r b38a6f5e042bcad4beb40c3df51d4fe162258575 -r 7ecbf85f918180a1ed415629968c763441bb0869 static/scripts/utils/config.js --- a/static/scripts/utils/config.js +++ b/static/scripts/utils/config.js @@ -32,7 +32,7 @@ * Cast and set value. This should be instead of * setting.set('value', new_value) */ - set_value: function(value) { + set_value: function(value, options) { var type = this.get('type');
if (type === 'float') { @@ -43,7 +43,7 @@ } // TODO: handle casting from string to bool?
- this.set('value', value); + this.set({value: value}, options); } }, { // This is a master list of default settings for known settings. @@ -101,10 +101,10 @@ /** * Set value for a setting. */ - set_value: function(key, value) { + set_value: function(key, value, options) { var s = this.get(key); if (s) { - return s.set_value(value); + return s.set_value(value, options); }
return undefined;
diff -r b38a6f5e042bcad4beb40c3df51d4fe162258575 -r 7ecbf85f918180a1ed415629968c763441bb0869 static/scripts/viz/circster.js --- a/static/scripts/viz/circster.js +++ b/static/scripts/viz/circster.js @@ -620,8 +620,13 @@ $.when(track.get('data_manager').get_genome_wide_data(this.genome)).then(function(genome_wide_data) { // Set bounds. self.data_bounds = self.get_data_bounds(genome_wide_data); - track.get('config').set_value('min_value', self.data_bounds[0]); - track.get('config').set_value('max_value', self.data_bounds[1]); + + // Set min, max value in config so that they can be adjusted. Make this silent + // because these attributes are watched for changes and the viz is updated + // accordingly (set up in initialize). Because we are setting up, we don't want + // the watch to trigger events here. + track.get('config').set_value('min_value', self.data_bounds[0], {silent: true}); + track.get('config').set_value('max_value', self.data_bounds[1], {silent: true});
// Merge chroms layout with data. layout_and_data = _.zip(chrom_arcs, genome_wide_data),
diff -r b38a6f5e042bcad4beb40c3df51d4fe162258575 -r 7ecbf85f918180a1ed415629968c763441bb0869 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -994,7 +994,8 @@ }; })); }); - } + }, + minLength: 2 }); }); if (this.vis_id !== undefined) {
diff -r b38a6f5e042bcad4beb40c3df51d4fe162258575 -r 7ecbf85f918180a1ed415629968c763441bb0869 static/scripts/viz/visualization.js --- a/static/scripts/viz/visualization.js +++ b/static/scripts/viz/visualization.js @@ -894,7 +894,7 @@
// -- Set up config settings. -- var models = [ - { key: 'name', value: this.get('dataset').get('name') }, + { key: 'name', default_value: this.get('dataset').get('name') }, { key: 'color' }, { key: 'min_value', label: 'Min Value', type: 'float', default_value: 0 }, { key: 'max_value', label: 'Max Value', type: 'float', default_value: 1 }
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.