[galaxy-commits] commit/galaxy-central: 4 new changesets

4 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/259865426c21/ Changeset: 259865426c21 Branch: stable User: dannon Date: 2013-04-17 03:38:38 Summary: Disable select2 for Input Dataset steps on the run workflow page. Affected #: 1 file diff -r 47ddf167c9f11c903a438c0979e101fe7535f061 -r 259865426c21fbfcfdcf4f8279487fee86ad1736 templates/webapps/galaxy/workflow/run.mako --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -40,12 +40,12 @@ select.val($('option:last', select).val()); } select.closest('.form-row').children('label').children('span.mode-icon').hide(); - select.removeAttr('multiple').refresh_select2().removeAttr('size'); + select.removeAttr('multiple').removeAttr('size'); placeholder = 'type to filter'; } else { $('.multiinput', select.closest('.form-row')).removeClass('disabled'); select.closest('.form-row').children('label').children('span.mode-icon').show(); - select.attr('multiple', 'multiple').refresh_select2().attr('size', 8); + select.attr('multiple', 'multiple').attr('size', 8); placeholder = 'type to filter, [enter] to select all'; } $('input.multiinput-filter', select.parent()).attr( @@ -79,7 +79,10 @@ $("#new_history_cbx").click(function(){ $("#new_history_input").toggle(this.checked); }); - $('span.multiinput_wrap select[name*="|input"]').removeAttr('multiple').refresh_select2().each(function(i, s) { + // The destroy on the following line is temporary and prevents + // select2 use on Input Dataset Steps, but allows elsewhere. We + // need a new widget to better handle pairwise matching. + $('span.multiinput_wrap select[name*="|input"]').removeAttr('multiple').select2("destroy").each(function(i, s) { var select = $(s); var new_width = Math.max(200, select.width()) + 20; // Find the label for this element. https://bitbucket.org/galaxy/galaxy-central/commits/b22d70ad9404/ Changeset: b22d70ad9404 Branch: stable User: dannon Date: 2013-04-17 03:47:17 Summary: Update multiselect tooltip, now functional. Was still using tipsy's 'original-title' attribute. Affected #: 1 file diff -r 259865426c21fbfcfdcf4f8279487fee86ad1736 -r b22d70ad94044a8cadf32e49385f414e60459e9d templates/webapps/galaxy/workflow/run.mako --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -91,7 +91,7 @@ if ($(this).hasClass('disabled')) return; toggle_multiinput(select); select.focus(); - }).attr('original-title', + }).attr('title', 'Enable/disable selection of multiple input ' + 'files. Each selected file will have an ' + 'instance of the workflow.').tooltip({placement: 'bottom'}) https://bitbucket.org/galaxy/galaxy-central/commits/fe1be67c576a/ Changeset: fe1be67c576a Branch: stable User: dannon Date: 2013-04-17 04:27:07 Summary: Add tooltips for (un)linking icon on run workflow page. Affected #: 1 file diff -r b22d70ad94044a8cadf32e49385f414e60459e9d -r fe1be67c576af3bc6890912b63863694b9eceb8c templates/webapps/galaxy/workflow/run.mako --- a/templates/webapps/galaxy/workflow/run.mako +++ b/templates/webapps/galaxy/workflow/run.mako @@ -141,13 +141,15 @@ $(function(){ $(".multi-mode").each(function(){ if($(this).val() == "matched") { - $(this).closest('.form-row').children('label').append($('<span class="icon-button link mode-icon"></span>') + $(this).closest('.form-row').children('label').append($('<span class="icon-button link mode-icon" title="This input is linked and will be run in matched order with other input datasets (ex: use this for matching forward and reverse reads)."></span>') .attr({id:$(this).attr("id")}) - .css("display", $(this).css("display"))); + .css("display", $(this).css("display")) + .tooltip({placement: 'bottom'})); } else { - $(this).closest('.form-row').children('label').append($('<span class="icon-button link-broken mode-icon"></span>') + $(this).closest('.form-row').children('label').append($('<span class="icon-button link-broken mode-icon" title="This input is not linked and each selection will be run against *all* other inputs."></span>') .attr({id:$(this).attr("id")}) - .css("display", $(this).css("display"))); + .css("display", $(this).css("display")) + .tooltip({placement: 'bottom'})); } }); $("span.mode-icon").click(function(){ https://bitbucket.org/galaxy/galaxy-central/commits/0899ad383fba/ Changeset: 0899ad383fba Branch: stable User: dannon Date: 2013-04-17 14:40:24 Summary: Fix more broken tooltips from the tipsy->bootstrap.tooltip() swap Affected #: 1 file diff -r fe1be67c576af3bc6890912b63863694b9eceb8c -r 0899ad383fba01c78077a3dfddb954bebaf6e72e templates/webapps/galaxy/workflow/editor.mako --- a/templates/webapps/galaxy/workflow/editor.mako +++ b/templates/webapps/galaxy/workflow/editor.mako @@ -1015,7 +1015,7 @@ ## Workflow name. <div id="workflow-name-area" class="form-row"><label>Name:</label> - <span id="workflow-name" class="tooltip editable-text" original-title="Click to rename workflow">${h.to_unicode( stored.name ) | h}</span> + <span id="workflow-name" class="tooltip editable-text" title="Click to rename workflow">${h.to_unicode( stored.name ) | h}</span></div> ## Workflow tags. <%namespace file="/tagging_common.mako" import="render_individual_tagging_element" /> @@ -1037,7 +1037,7 @@ ## Annotation elt. <div id="workflow-annotation-area" class="form-row"><label>Annotation / Notes:</label> - <div id="workflow-annotation" class="tooltip editable-text" original-title="Click to edit annotation"> + <div id="workflow-annotation" class="tooltip editable-text" title="Click to edit annotation"> %if annotation: ${h.to_unicode( annotation ) | h} %else: 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.