3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/e5a58a1d3d90/ changeset: e5a58a1d3d90 user: jgoecks date: 2012-03-26 16:16:39 summary: Trackster: make show/hide content compatible with 8e9d2b492c4c. affected #: 1 file diff -r 4a23e38b7a12d65b50ff274272305f89fb5d0309 -r e5a58a1d3d900105cdedd6ee9249d958834f60c3 static/scripts/trackster.js --- a/static/scripts/trackster.js +++ b/static/scripts/trackster.js @@ -393,8 +393,8 @@ DATA_ERROR = "There was an error in indexing this dataset. ", DATA_NOCONVERTER = "A converter for this dataset is not installed. Please check your datatypes_conf.xml file.", DATA_NONE = "No data for this chrom/contig.", - DATA_PENDING = "Preparing data. This takes seconds for a small dataset but longer for a large dataset.<br/>\ - You can save and close the visualization and preparation will continue.<br/>", + DATA_PENDING = "Preparing data. This is very fast for a small dataset but can take a long time for a large dataset. \ + If visualization is saved and closed, preparation will continue in the background.", DATA_CANNOT_RUN_TOOL = "Tool cannot be rerun: ", DATA_LOADING = "Loading data...", DATA_OK = "Ready for display", @@ -3329,18 +3329,15 @@ * Hide any elements that are part of the tracks contents area. Should * remove as approprite, the track will be redrawn by show_contents. */ - hide_contents : function () { - // Clear contents by removing any elements that are contained in - // the tracks content_div - this.content_div.children().remove(); - // Hide the content div - this.content_div.hide(); - // And any y axis labels (common to several track types) + hide_contents: function () { + // Hide tiles. + this.tiles_div.hide(); + // Hide any y axis labels (common to several track types) this.container_div.find(".yaxislabel, .track-resize").hide() }, - show_contents : function() { + show_contents: function() { // Show the contents div and labels (if present) - this.content_div.show(); + this.tiles_div.show(); this.container_div.find(".yaxislabel, .track-resize").show() // Request a redraw of the content this.request_draw(); @@ -4282,7 +4279,7 @@ } return new Tile(track, tile_index, resolution, canvas, seq); } - this.content_div.css("height", "0px"); + track.content_div.css("height", "0px"); }, /** * If there is a tile with sequence data, set content div so that data is visible. https://bitbucket.org/galaxy/galaxy-central/changeset/3b396a26aaf6/ changeset: 3b396a26aaf6 user: jgoecks date: 2012-03-26 16:17:22 summary: Merge. affected #: 1 file diff -r e5a58a1d3d900105cdedd6ee9249d958834f60c3 -r 3b396a26aaf6d78480750e0a8d038a034153f887 lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -1183,7 +1183,7 @@ self.job_runners = {} start_job_runners = ["local"] if app.config.start_job_runners is not None: - start_job_runners.extend( app.config.start_job_runners.split(",") ) + start_job_runners.extend( [ x.strip() for x in util.listify( app.config.start_job_runners ) ] ) if app.config.use_tasked_jobs: start_job_runners.append("tasks") for name in start_job_runners: https://bitbucket.org/galaxy/galaxy-central/changeset/b17faef8f1f3/ changeset: b17faef8f1f3 user: jgoecks date: 2012-03-26 16:18:09 summary: Add open ID config to .hgignore affected #: 1 file diff -r 3b396a26aaf6d78480750e0a8d038a034153f887 -r b17faef8f1f36dda41f44206805b35896ce57cdc .hgignore --- a/.hgignore +++ b/.hgignore @@ -36,6 +36,7 @@ tool_data_table_conf.xml tool_sheds_conf.xml integrated_tool_panel.xml +openid_conf.xml static/welcome.html.* static/welcome.html 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.