galaxy-dist commit 91d047183110: Fix bug that prevented correct toggling of recently used menu.

Tuesday, 29 June 2010

# HG changeset patch -- Bitbucket.org
# Project galaxy-dist
# URL http://bitbucket.org/galaxy/galaxy-dist/overview
# User jeremy goecks <jeremy.goecks(a)emory.edu&gt;
# Date 1277147258 14400
# Node ID 91d047183110888b3bbcbfc99a0b5f2c38c2d6bf
# Parent  4cdf4cca0f313c5c3a6045db287a32a3d1e4d30b
Fix bug that prevented correct toggling of recently used menu.

--- a/templates/root/index.mako
+++ b/templates/root/index.mako
@@ -124,10 +124,7 @@
                     else
                     {
                         // "Show" menu.
-                        var tool_search_query =
$('#galaxy_tools').contents().find('#tool-search-query');
-                        var tool_search_active =
tool_search_query.is(":visible") && tool_search_query.val().length >
3;
-                        
-                        if (!tool_search_active)
+                        if
(!$('#galaxy_tools').contents().find('#tool-search-query').hasClass("search_active"))
                             // Default.
                             ru_menu.slideDown();
                         else

--- a/templates/root/tool_menu.mako
+++ b/templates/root/tool_menu.mako
@@ -113,6 +113,8 @@
                     if ( this.value.length < 3 ) {
                         reset_tool_search(false);
                     } else if ( this.value != this.lastValue ) {
+                        // Add class to denote that searching is active.
+                        $(this).addClass("search_active");
                         // input.addClass(config.loadingClass);
                         // Add '*' to facilitate partial matching.
                         var q = this.value + '*';

--- a/static/scripts/galaxy.base.js
+++ b/static/scripts/galaxy.base.js
@@ -478,7 +478,8 @@ function reset_tool_search( initValue )
     if (tool_menu_frame.length == 0)
         tool_menu_frame = $(document);
         
-    // Remove matching class.
+    // Remove classes that indicate searching is active.
+    $(this).removeClass("search_active");
     tool_menu_frame.find(".toolTitle").removeClass("search_match");
     
     // Reset visibility of tools and labels.

--- a/static/scripts/packed/galaxy.base.js
+++ b/static/scripts/packed/galaxy.base.js
@@ -1,1 +1,1 @@
-$.fn.makeAbsolute=function(a){return this.each(function(){var b=$(this);var
c=b.position();b.css({position:"absolute",marginLeft:0,marginTop:0,top:c.top,left:c.left,right:$(window).width()-(c.left+b.width())});if(a){b.remove().appendTo("body")}})};function
ensure_popup_helper(){if($("#popup-helper").length===0){$("<div
id='popup-helper'/>").css({background:"white",opacity:0,zIndex:15000,position:"absolute",top:0,left:0,width:"100%",height:"100%"}).appendTo("body").hide()}}function
attach_popupmenu(b,d){var
a=function(){d.unbind().hide();$("#popup-helper").unbind("click.popupmenu").hide()};var
c=function(g){$("#popup-helper").bind("click.popupmenu",a).show();d.click(a).css({left:0,top:-1000}).show();var
f=g.pageX-d.width()/2;f=Math.min(f,$(document).scrollLeft()+$(window).width()-$(d).width()-20);f=Math.max(f,$(document).scrollLeft()+20);d.css({top:g.pageY-5,left:f});return
false};$(b).click(c)}function make_popupmenu(c,b){ensure_popup_helper();var
a=$("<ul id='"+c.attr("id")

+"-menu'></ul>");$.each(b,function(f,e){if(e){$("<li/>").html(f).click(e).appendTo(a)}else{$("<li
class='head'/>").html(f).appendTo(a)}});var d=$("<div
class='popmenu-wrapper'>");d.append(a).append("<div
class='overlay-border'>").css("position","absolute").appendTo("body").hide();attach_popupmenu(c,d)}function
make_popup_menus(){jQuery("div[popupmenu]").each(function(){var
c={};$(this).find("a").each(function(){var
b=$(this).attr("confirm"),d=$(this).attr("href"),e=$(this).attr("target");c[$(this).text()]=function(){if(!b||confirm(b)){var
g=window;if(e=="_parent"){g=window.parent}else{if(e=="_top"){g=window.top}}g.location=d}}});var
a=$("#"+$(this).attr("popupmenu"));make_popupmenu(a,c);$(this).remove();a.addClass("popup").show()})}function
array_length(b){if(b.length){return b.length}var c=0;for(var a in b){c++}return c}function
naturalSort(i,g){var
n=/(-?[0-9\.]+)/g,j=i.toString().toLowerCase()||"",f=g.toString().toLowerCase()||"",k=String.fromCharCode(0),l=j.replace(n,k+"
 $1"+k).split(k),e=f.replace(n,k+"$1"+k).split(k),d=(new
Date(j)).getTime(),m=d?(new Date(f)).getTime():null;if(m){if(d<m){return
-1}else{if(d>m){return 1}}}for(var
h=0,c=Math.max(l.length,e.length);h<c;h++){oFxNcL=parseFloat(l[h])||l[h];oFyNcL=parseFloat(e[h])||e[h];if(oFxNcL<oFyNcL){return
-1}else{if(oFxNcL>oFyNcL){return 1}}}return 0}function
replace_big_select_inputs(a,b){if(!jQuery().autocomplete){return}if(a===undefined){a=20}if(b===undefined){b=3000}$("select").each(function(){var
e=$(this);var
h=e.find("option").length;if((h<a)||(h>b)){return}if(e.attr("multiple")==true){return}var
l=e.attr("value");var c=$("<input type='text'
class='text-and-autocomplete-select'></input>");c.attr("size",40);c.attr("name",e.attr("name"));c.attr("id",e.attr("id"));c.click(function(){var
m=$(this).val();$(this).val("Loading...");$(this).showAllInCache();$(this).val(m);$(this).select()});var
f=[];var i={};e.children("option").each(function(){var n=$(this).text();var
m=$(this).attr("value

");f.push(n);i[n]=m;i[m]=m;if(m==l){c.attr("value",n)}});if(l==""||l=="?"){c.attr("value","Click
to Search or
Select")}if(e.attr("name")=="dbkey"){f=f.sort(naturalSort)}var
g={selectFirst:false,autoFill:false,mustMatch:false,matchContains:true,max:b,minChars:0,hideForLessThanMinChars:false};c.autocomplete(f,g);e.replaceWith(c);var
k=function(){var n=c.attr("value");var
m=i[n];if(m!==null&&m!==undefined){c.attr("value",m)}else{if(l!=""){c.attr("value",l)}else{c.attr("value","?")}}};c.parents("form").submit(function(){k()});$(document).bind("convert_dbkeys",function(){k()});if(e.attr("refresh_on_change")=="true"){var
d=e.attr("refresh_on_change_values");if(d!==undefined){d=d.split(",")}var
j=function(){var o=c.attr("value");var
n=i[o];if(n!==null&&n!==undefined){refresh=false;if(d!==undefined){for(var
m=0;m<d.length;m++){if(n==d[m]){refresh=true;break}}}else{refresh=true}if(refresh){c.attr("value",n);c.parents("form").submit()}}};c.bind("result",j);c.keyup(function(m){if(m.key
 Code===13){j()}});c.keydown(function(m){if(m.keyCode===13){return false}})}})}function
async_save_text(d,f,e,a,c,h,i,g,b){if(c===undefined){c=30}if(i===undefined){i=4}$("#"+d).live("click",function(){if($("#renaming-active").length>0){return}var
l=$("#"+f),k=l.text(),j;if(h){j=$("<textarea></textarea>").attr({rows:i,cols:c}).text(k)}else{j=$("<input
type='text'></input>").attr({value:k,size:c})}j.attr("id","renaming-active");j.blur(function(){$(this).remove();l.show();if(b){b(j)}});j.keyup(function(n){if(n.keyCode===27){$(this).trigger("blur")}else{if(n.keyCode===13){var
m={};m[a]=$(this).val();$(this).trigger("blur");$.ajax({url:e,data:m,error:function(){alert("Text
editing for elt "+f+"
failed")},success:function(o){l.text(o);if(b){b(j)}}})}}});if(g){g(j)}l.hide();j.insertAfter(l);j.focus();j.select();return})}function
init_history_items(d,a,c){var b=function(){try{var
e=$.jStore.store("history_expand_state");if(e){for(var g in
e){$("#"+g+" div.historyItemBody").show()}}}c

atch(f){$.jStore.remove("history_expand_state")}if($.browser.mozilla){$("div.historyItemBody").each(function(){if(!$(this).is(":visible")){$(this).find("pre.peek").css("overflow","hidden")}})}d.each(function(){var
j=this.id;var h=$(this).children("div.historyItemBody");var
i=h.find("pre.peek");$(this).find(".historyItemTitleBar >
.historyItemTitle").wrap("<a
href='javascript:void(0);'></a>").click(function(){if(h.is(":visible")){if($.browser.mozilla){i.css("overflow","hidden")}h.slideUp("fast");if(!c){var
k=$.jStore.store("history_expand_state");if(k){delete
k[j];$.jStore.store("history_expand_state",k)}}}else{h.slideDown("fast",function(){if($.browser.mozilla){i.css("overflow","auto")}});if(!c){var
k=$.jStore.store("history_expand_state");if(k===undefined){k={}}k[j]=true;$.jStore.store("history_expand_state",k)}}return
false})});$("#top-links > a.toggle").click(function(){var
h=$.jStore.store("history_expand_state");if(h===undefined){h={}}$("div.historyItemBody:visible").ea

ch(function(){if($.browser.mozilla){$(this).find("pre.peek").css("overflow","hidden")}$(this).slideUp("fast");if(h){delete
h[$(this).parent().attr("id")]}});$.jStore.store("history_expand_state",h)}).show()};if(a){b()}else{$.jStore.init("galaxy");$.jStore.engineReady(function(){b()})}}function
commatize(b){b+="";var
a=/(\d+)(\d{3})/;while(a.test(b)){b=b.replace(a,"$1,$2")}return b}function
reset_tool_search(a){var
c=$("#galaxy_tools").contents();if(c.length==0){c=$(document)}c.find(".toolTitle").removeClass("search_match");c.find(".toolSectionBody").hide();c.find(".toolTitle").show();c.find(".toolPanelLabel").show();c.find(".toolSectionWrapper").each(function(){if($(this).attr("id")!="recently_used_wrapper"){$(this).show()}else{if($(this).hasClass("user_pref_visible")){$(this).show()}}});c.find("#search-no-results").hide();c.find("#search-spinner").hide();if(a){var
b=c.find("#tool-search-query");b.val("search
tools");b.css("font-style","italic")}}function
GalaxyAsync(a){this

.url_dict={};this.log_action=(a===undefined?false:a)}GalaxyAsync.prototype.set_func_url=function(a,b){this.url_dict[a]=b};GalaxyAsync.prototype.set_user_pref=function(a,b){var
c=this.url_dict[arguments.callee];if(c===undefined){return
false}$.ajax({url:c,data:{pref_name:a,pref_value:b},error:function(){return
false},success:function(){return
true}})};GalaxyAsync.prototype.log_user_action=function(c,b,d){if(!this.log_action){return}var
a=this.url_dict[arguments.callee];if(a===undefined){return
false}$.ajax({url:a,data:{action:c,context:b,params:d},error:function(){return
false},success:function(){return
true}})};$(document).ready(function(){$("a[confirm]").click(function(){return
confirm($(this).attr("confirm"))});if($.fn.tipsy){$(".tooltip").tipsy({gravity:"s"})}make_popup_menus();replace_big_select_inputs(20,1500)});
+$.fn.makeAbsolute=function(a){return this.each(function(){var b=$(this);var
c=b.position();b.css({position:"absolute",marginLeft:0,marginTop:0,top:c.top,left:c.left,right:$(window).width()-(c.left+b.width())});if(a){b.remove().appendTo("body")}})};function
ensure_popup_helper(){if($("#popup-helper").length===0){$("<div
id='popup-helper'/>").css({background:"white",opacity:0,zIndex:15000,position:"absolute",top:0,left:0,width:"100%",height:"100%"}).appendTo("body").hide()}}function
attach_popupmenu(b,d){var
a=function(){d.unbind().hide();$("#popup-helper").unbind("click.popupmenu").hide()};var
c=function(g){$("#popup-helper").bind("click.popupmenu",a).show();d.click(a).css({left:0,top:-1000}).show();var
f=g.pageX-d.width()/2;f=Math.min(f,$(document).scrollLeft()+$(window).width()-$(d).width()-20);f=Math.max(f,$(document).scrollLeft()+20);d.css({top:g.pageY-5,left:f});return
false};$(b).click(c)}function make_popupmenu(c,b){ensure_popup_helper();var
a=$("<ul id='"+c.attr("id")

+"-menu'></ul>");$.each(b,function(f,e){if(e){$("<li/>").html(f).click(e).appendTo(a)}else{$("<li
class='head'/>").html(f).appendTo(a)}});var d=$("<div
class='popmenu-wrapper'>");d.append(a).append("<div
class='overlay-border'>").css("position","absolute").appendTo("body").hide();attach_popupmenu(c,d)}function
make_popup_menus(){jQuery("div[popupmenu]").each(function(){var
c={};$(this).find("a").each(function(){var
b=$(this).attr("confirm"),d=$(this).attr("href"),e=$(this).attr("target");c[$(this).text()]=function(){if(!b||confirm(b)){var
g=window;if(e=="_parent"){g=window.parent}else{if(e=="_top"){g=window.top}}g.location=d}}});var
a=$("#"+$(this).attr("popupmenu"));make_popupmenu(a,c);$(this).remove();a.addClass("popup").show()})}function
array_length(b){if(b.length){return b.length}var c=0;for(var a in b){c++}return c}function
naturalSort(i,g){var
n=/(-?[0-9\.]+)/g,j=i.toString().toLowerCase()||"",f=g.toString().toLowerCase()||"",k=String.fromCharCode(0),l=j.replace(n,k+"
 $1"+k).split(k),e=f.replace(n,k+"$1"+k).split(k),d=(new
Date(j)).getTime(),m=d?(new Date(f)).getTime():null;if(m){if(d<m){return
-1}else{if(d>m){return 1}}}for(var
h=0,c=Math.max(l.length,e.length);h<c;h++){oFxNcL=parseFloat(l[h])||l[h];oFyNcL=parseFloat(e[h])||e[h];if(oFxNcL<oFyNcL){return
-1}else{if(oFxNcL>oFyNcL){return 1}}}return 0}function
replace_big_select_inputs(a,b){if(!jQuery().autocomplete){return}if(a===undefined){a=20}if(b===undefined){b=3000}$("select").each(function(){var
e=$(this);var
h=e.find("option").length;if((h<a)||(h>b)){return}if(e.attr("multiple")==true){return}var
l=e.attr("value");var c=$("<input type='text'
class='text-and-autocomplete-select'></input>");c.attr("size",40);c.attr("name",e.attr("name"));c.attr("id",e.attr("id"));c.click(function(){var
m=$(this).val();$(this).val("Loading...");$(this).showAllInCache();$(this).val(m);$(this).select()});var
f=[];var i={};e.children("option").each(function(){var n=$(this).text();var
m=$(this).attr("value

");f.push(n);i[n]=m;i[m]=m;if(m==l){c.attr("value",n)}});if(l==""||l=="?"){c.attr("value","Click
to Search or
Select")}if(e.attr("name")=="dbkey"){f=f.sort(naturalSort)}var
g={selectFirst:false,autoFill:false,mustMatch:false,matchContains:true,max:b,minChars:0,hideForLessThanMinChars:false};c.autocomplete(f,g);e.replaceWith(c);var
k=function(){var n=c.attr("value");var
m=i[n];if(m!==null&&m!==undefined){c.attr("value",m)}else{if(l!=""){c.attr("value",l)}else{c.attr("value","?")}}};c.parents("form").submit(function(){k()});$(document).bind("convert_dbkeys",function(){k()});if(e.attr("refresh_on_change")=="true"){var
d=e.attr("refresh_on_change_values");if(d!==undefined){d=d.split(",")}var
j=function(){var o=c.attr("value");var
n=i[o];if(n!==null&&n!==undefined){refresh=false;if(d!==undefined){for(var
m=0;m<d.length;m++){if(n==d[m]){refresh=true;break}}}else{refresh=true}if(refresh){c.attr("value",n);c.parents("form").submit()}}};c.bind("result",j);c.keyup(function(m){if(m.key
 Code===13){j()}});c.keydown(function(m){if(m.keyCode===13){return false}})}})}function
async_save_text(d,f,e,a,c,h,i,g,b){if(c===undefined){c=30}if(i===undefined){i=4}$("#"+d).live("click",function(){if($("#renaming-active").length>0){return}var
l=$("#"+f),k=l.text(),j;if(h){j=$("<textarea></textarea>").attr({rows:i,cols:c}).text(k)}else{j=$("<input
type='text'></input>").attr({value:k,size:c})}j.attr("id","renaming-active");j.blur(function(){$(this).remove();l.show();if(b){b(j)}});j.keyup(function(n){if(n.keyCode===27){$(this).trigger("blur")}else{if(n.keyCode===13){var
m={};m[a]=$(this).val();$(this).trigger("blur");$.ajax({url:e,data:m,error:function(){alert("Text
editing for elt "+f+"
failed")},success:function(o){l.text(o);if(b){b(j)}}})}}});if(g){g(j)}l.hide();j.insertAfter(l);j.focus();j.select();return})}function
init_history_items(d,a,c){var b=function(){try{var
e=$.jStore.store("history_expand_state");if(e){for(var g in
e){$("#"+g+" div.historyItemBody").show()}}}c

atch(f){$.jStore.remove("history_expand_state")}if($.browser.mozilla){$("div.historyItemBody").each(function(){if(!$(this).is(":visible")){$(this).find("pre.peek").css("overflow","hidden")}})}d.each(function(){var
j=this.id;var h=$(this).children("div.historyItemBody");var
i=h.find("pre.peek");$(this).find(".historyItemTitleBar >
.historyItemTitle").wrap("<a
href='javascript:void(0);'></a>").click(function(){if(h.is(":visible")){if($.browser.mozilla){i.css("overflow","hidden")}h.slideUp("fast");if(!c){var
k=$.jStore.store("history_expand_state");if(k){delete
k[j];$.jStore.store("history_expand_state",k)}}}else{h.slideDown("fast",function(){if($.browser.mozilla){i.css("overflow","auto")}});if(!c){var
k=$.jStore.store("history_expand_state");if(k===undefined){k={}}k[j]=true;$.jStore.store("history_expand_state",k)}}return
false})});$("#top-links > a.toggle").click(function(){var
h=$.jStore.store("history_expand_state");if(h===undefined){h={}}$("div.historyItemBody:visible").ea

ch(function(){if($.browser.mozilla){$(this).find("pre.peek").css("overflow","hidden")}$(this).slideUp("fast");if(h){delete
h[$(this).parent().attr("id")]}});$.jStore.store("history_expand_state",h)}).show()};if(a){b()}else{$.jStore.init("galaxy");$.jStore.engineReady(function(){b()})}}function
commatize(b){b+="";var
a=/(\d+)(\d{3})/;while(a.test(b)){b=b.replace(a,"$1,$2")}return b}function
reset_tool_search(a){var
c=$("#galaxy_tools").contents();if(c.length==0){c=$(document)}$(this).removeClass("search_active");c.find(".toolTitle").removeClass("search_match");c.find(".toolSectionBody").hide();c.find(".toolTitle").show();c.find(".toolPanelLabel").show();c.find(".toolSectionWrapper").each(function(){if($(this).attr("id")!="recently_used_wrapper"){$(this).show()}else{if($(this).hasClass("user_pref_visible")){$(this).show()}}});c.find("#search-no-results").hide();c.find("#search-spinner").hide();if(a){var
b=c.find("#tool-search-query");b.val("search
tools");b.css("font-style","i
 talic")}}function
GalaxyAsync(a){this.url_dict={};this.log_action=(a===undefined?false:a)}GalaxyAsync.prototype.set_func_url=function(a,b){this.url_dict[a]=b};GalaxyAsync.prototype.set_user_pref=function(a,b){var
c=this.url_dict[arguments.callee];if(c===undefined){return
false}$.ajax({url:c,data:{pref_name:a,pref_value:b},error:function(){return
false},success:function(){return
true}})};GalaxyAsync.prototype.log_user_action=function(c,b,d){if(!this.log_action){return}var
a=this.url_dict[arguments.callee];if(a===undefined){return
false}$.ajax({url:a,data:{action:c,context:b,params:d},error:function(){return
false},success:function(){return
true}})};$(document).ready(function(){$("a[confirm]").click(function(){return
confirm($(this).attr("confirm"))});if($.fn.tipsy){$(".tooltip").tipsy({gravity:"s"})}make_popup_menus();replace_big_select_inputs(20,1500)});

    

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010