From aaf9aa7fa4414f74faba508a9c4bd280860298f5 Mon Sep 17 00:00:00 2001 From: janani Date: Sat, 13 Jul 2019 16:27:21 +0200 Subject: [PATCH 1/4] Issue#8105: Make tool favourite query a toggle - The favourite button has been changed to toggle between clearing the search and showing the favourites --- .../galaxy/scripts/entry/panels/tool-panel.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/client/galaxy/scripts/entry/panels/tool-panel.js b/client/galaxy/scripts/entry/panels/tool-panel.js index 47b1ab4cfbe..4c0798608a6 100644 --- a/client/galaxy/scripts/entry/panels/tool-panel.js +++ b/client/galaxy/scripts/entry/panels/tool-panel.js @@ -52,9 +52,21 @@ const ToolPanel = Backbone.View.extend({ title: _l("Show favorites"), icon: "fa fa-star-o", onclick: e => { - $("#tool-search-query") - .val("#favorites") - .trigger("change"); + $(".panel-header-button .fa").toggleClass("fa-star-o fa-star"); + //hide the tooltip + $(".panel-header-button").tooltip('hide'); + if($("#tool-search-query").val().indexOf("#favorites")!= -1) + { + $("#tool-search-query").val(""); + $("#tool-search-query").keyup(); + $(".panel-header-button").attr("title",""); + } + else + { + $("#tool-search-query") + .val("#favorites") + .trigger("change"); + } } }); panel_buttons.push(this.favorite_button); From 6e1504b0df503d2c5c945a6cd8b4816bdd891493 Mon Sep 17 00:00:00 2001 From: janani Date: Wed, 17 Jul 2019 02:48:39 +0200 Subject: [PATCH 2/4] Code updated for Issue#8105: Make tool favourite query a toggle --- .../galaxy/scripts/entry/panels/tool-panel.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/client/galaxy/scripts/entry/panels/tool-panel.js b/client/galaxy/scripts/entry/panels/tool-panel.js index 4c0798608a6..eb133b53fae 100644 --- a/client/galaxy/scripts/entry/panels/tool-panel.js +++ b/client/galaxy/scripts/entry/panels/tool-panel.js @@ -52,20 +52,21 @@ const ToolPanel = Backbone.View.extend({ title: _l("Show favorites"), icon: "fa fa-star-o", onclick: e => { + var search_query = $("#tool-search-query"); + var header_btn = $(".panel-header-button"); $(".panel-header-button .fa").toggleClass("fa-star-o fa-star"); //hide the tooltip - $(".panel-header-button").tooltip('hide'); - if($("#tool-search-query").val().indexOf("#favorites")!= -1) + header_btn.tooltip('hide'); + if(search_query.val().indexOf("#favorites")!= -1) { - $("#tool-search-query").val(""); - $("#tool-search-query").keyup(); - $(".panel-header-button").attr("title",""); + search_query.val(""); + search_query.keyup(); + header_btn.attr("title",""); } else { - $("#tool-search-query") - .val("#favorites") - .trigger("change"); + search_query.val("#favorites").trigger("change"); + } } }); From 079c6586b3cfbda9eb0290652f5b3c51edd3d91a Mon Sep 17 00:00:00 2001 From: janani Date: Wed, 17 Jul 2019 14:30:18 +0200 Subject: [PATCH 3/4] Code updated for Issue#8105: Make tool favourite query a toggle --- client/galaxy/scripts/entry/panels/tool-panel.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/galaxy/scripts/entry/panels/tool-panel.js b/client/galaxy/scripts/entry/panels/tool-panel.js index eb133b53fae..4753209dfd3 100644 --- a/client/galaxy/scripts/entry/panels/tool-panel.js +++ b/client/galaxy/scripts/entry/panels/tool-panel.js @@ -52,8 +52,8 @@ const ToolPanel = Backbone.View.extend({ title: _l("Show favorites"), icon: "fa fa-star-o", onclick: e => { - var search_query = $("#tool-search-query"); - var header_btn = $(".panel-header-button"); + const search_query = $("#tool-search-query"); + const header_btn = $(".panel-header-button"); $(".panel-header-button .fa").toggleClass("fa-star-o fa-star"); //hide the tooltip header_btn.tooltip('hide'); @@ -66,7 +66,6 @@ const ToolPanel = Backbone.View.extend({ else { search_query.val("#favorites").trigger("change"); - } } }); From 8d7280db4b5d1e638e1170a103bf65d22c6970b1 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Thu, 1 Aug 2019 15:09:55 -0400 Subject: [PATCH 4/4] use standard naming and format --- .../galaxy/scripts/entry/panels/tool-panel.js | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/client/galaxy/scripts/entry/panels/tool-panel.js b/client/galaxy/scripts/entry/panels/tool-panel.js index 4753209dfd3..e59bb4f492e 100644 --- a/client/galaxy/scripts/entry/panels/tool-panel.js +++ b/client/galaxy/scripts/entry/panels/tool-panel.js @@ -52,21 +52,17 @@ const ToolPanel = Backbone.View.extend({ title: _l("Show favorites"), icon: "fa fa-star-o", onclick: e => { - const search_query = $("#tool-search-query"); - const header_btn = $(".panel-header-button"); - $(".panel-header-button .fa").toggleClass("fa-star-o fa-star"); - //hide the tooltip - header_btn.tooltip('hide'); - if(search_query.val().indexOf("#favorites")!= -1) - { - search_query.val(""); - search_query.keyup(); - header_btn.attr("title",""); - } - else - { - search_query.val("#favorites").trigger("change"); - } + const $search_query = $("#tool-search-query"); + const $header_btn = $(".panel-header-button"); + $header_btn.find(".fa").toggleClass("fa-star-o fa-star"); + $header_btn.tooltip("hide"); + if ($search_query.val().indexOf("#favorites") != -1) { + $search_query.val(""); + $search_query.keyup(); + $header_btn.attr("title", ""); + } else { + $search_query.val("#favorites").trigger("change"); + } } }); panel_buttons.push(this.favorite_button);