2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/b1134c82e101/ changeset: b1134c82e101 user: jgoecks date: 2011-10-25 02:28:28 summary: Trackster: refactor constructor code for cleaner initialization. affected #: 1 file diff -r d0842bf94ff95b7b34cb46f5dbcc9a25167110c7 -r b1134c82e101b47545531f2318a9b060342c9fd2 static/scripts/trackster.js --- a/static/scripts/trackster.js +++ b/static/scripts/trackster.js @@ -2558,7 +2558,9 @@ predraw_init: function() {} }); -var TiledTrack = function(filters_list, tool_dict) { +var TiledTrack = function(name, view, container, show_header, prefs, filters_list, tool_dict, data_url, data_query_wait) { + Track.call(this, name, view, container, show_header, prefs, data_url, data_query_wait); + var track = this, view = track.view; @@ -2938,8 +2940,7 @@ }); var ReferenceTrack = function (view) { - Track.call(this, "reference", view, { content_div: view.top_labeltrack }, false, {}); - TiledTrack.call(this); + TiledTrack.call(this, "reference", view, { content_div: view.top_labeltrack }, false, {}); view.reference_track = this; this.left_offset = 200; @@ -2991,8 +2992,7 @@ var track = this; this.display_modes = ["Histogram", "Line", "Filled", "Intensity"]; this.mode = "Histogram"; - Track.call( this, name, view, container, prefs ); - TiledTrack.call( this ); + TiledTrack.call( this, name, view, container, true, prefs ); this.min_height_px = 16; this.max_height_px = 400; @@ -3137,11 +3137,8 @@ // // Initialization. - // - - // FIXME: cleaner init needed; should just be able to call TiledTrack() - Track.call(this, name, view, container, true, prefs); - TiledTrack.call(this, filters, tool); + // + TiledTrack.call(this, name, view, container, true, prefs, filters, tool); // Define and restore track configuration. this.config = new DrawableConfig( { https://bitbucket.org/galaxy/galaxy-central/changeset/1b05c45a0c1a/ changeset: 1b05c45a0c1a user: jgoecks date: 2011-10-25 04:08:57 summary: Merge. affected #: 3 files diff -r b1134c82e101b47545531f2318a9b060342c9fd2 -r 1b05c45a0c1ac22c4bac8c2f8685eae32ca67ce6 tools/gatk/variant_apply_recalibration.xml --- a/tools/gatk/variant_apply_recalibration.xml +++ b/tools/gatk/variant_apply_recalibration.xml @@ -102,9 +102,9 @@ <param name="input_recal" type="data" format="gatk_recal" label="Variant Recalibration file" /><param name="input_tranches" type="data" format="gatk_tranche" label="Variant Tranches file" /><param name="ref_file" type="select" label="Using reference genome"> - <!-- <options from_data_table="picard_indexes"> - <filter type="data_meta" key="dbkey" ref="variants[0].input_variants" column="dbkey"/> - </options> --> + <options from_data_table="picard_indexes"> + <!-- <filter type="data_meta" key="dbkey" ref="variants[0].input_variants" column="dbkey"/> --> + </options></param></when><when value="history"><!-- FIX ME!!!! --> diff -r b1134c82e101b47545531f2318a9b060342c9fd2 -r 1b05c45a0c1ac22c4bac8c2f8685eae32ca67ce6 tools/gatk/variant_eval.xml --- a/tools/gatk/variant_eval.xml +++ b/tools/gatk/variant_eval.xml @@ -159,9 +159,9 @@ <param name="input_variant" type="data" format="vcf" label="Input variant file" /></repeat><param name="ref_file" type="select" label="Using reference genome"> - <!--<options from_data_table="picard_indexes"> - <filter type="data_meta" key="dbkey" ref="input_variant" column="dbkey"/> - </options>--> + <options from_data_table="picard_indexes"> + <!-- <filter type="data_meta" key="dbkey" ref="input_variant" column="dbkey"/> --> + </options></param></when><when value="history"><!-- FIX ME!!!! --> diff -r b1134c82e101b47545531f2318a9b060342c9fd2 -r 1b05c45a0c1ac22c4bac8c2f8685eae32ca67ce6 tools/gatk/variant_recalibrator.xml --- a/tools/gatk/variant_recalibrator.xml +++ b/tools/gatk/variant_recalibrator.xml @@ -152,9 +152,9 @@ <param name="input_variants" type="data" format="vcf" label="Variant file to recalibrate" /></repeat><param name="ref_file" type="select" label="Using reference genome"> - <!-- <options from_data_table="picard_indexes"> - <filter type="data_meta" key="dbkey" ref="variants[0].input_variants" column="dbkey"/> - </options> --> + <options from_data_table="picard_indexes"> + <!-- <filter type="data_meta" key="dbkey" ref="variants[0].input_variants" column="dbkey"/> --> + </options></param></when><when value="history"><!-- FIX ME!!!! --> 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.