diff --git a/public/lib/software-catalog-component.js b/public/lib/software-catalog-component.js index 736aac7..c16e343 100644 --- a/public/lib/software-catalog-component.js +++ b/public/lib/software-catalog-component.js @@ -3,39 +3,7 @@ modulejs.define('SoftwareCatalogComponent', ['jquery'], function($) { var dispatch_ajax_function; - - function show_head_message() { - if ($("#filter-categories-select-catalog").text().length === 0){ - $("#filter-categories-select-catalog").hide(); - $("#filter-option-catalog-software").show(); - }else{ - $("#filter-categories-select-catalog").show(); - $("#filter-option-catalog-software").hide(); - } - } - - - function slideDowsCategoriesOptionAndHideOptionCatalog() { - $("#filter-categories-option").slideDown(); - $("#filter-option-catalog-software").hide(); - } - - - function slideDownCategoriesOptionAndHideCategoriesSelect() { - $("#filter-categories-option").slideDown(); - $("#filter-categories-select-catalog").hide(); - } - - - function slideUpCategoriesAndShowHeadMessage() { - $("#filter-categories-option").slideUp(); - show_head_message(); - } - - function clearCatalogCheckbox() { - $("#filter-categories-option").slideUp(); - $("#filter-option-catalog-software").show(); $("#group-categories input:checked").each(function() { $(this).prop('checked', false); }); @@ -45,39 +13,26 @@ modulejs.define('SoftwareCatalogComponent', ['jquery'], function($) { function selectCheckboxCategory(dispatch_ajax) { - $("#filter-categories-option").slideUp(); - $("#filter-categories-select-catalog").show(); - $("#filter-option-catalog-software").hide(); - dispatch_ajax_function(true); } function selectProjectSoftwareCheckbox() { - $("#filter-categories-option").slideUp(); - $("#filter-categories-select-catalog").show(); - $("#filter-option-catalog-software").hide(); - dispatch_ajax_function(true); - show_head_message(); } function set_events() { - $("#filter-option-catalog-software").click(slideDowsCategoriesOptionAndHideOptionCatalog); - $("#filter-categories-select-catalog").click(slideDownCategoriesOptionAndHideCategoriesSelect); - $("#close-filter-catalog").click(slideUpCategoriesAndShowHeadMessage); $("#cleanup-filter-catalg").click(clearCatalogCheckbox); $(".categories-catalog").click(selectCheckboxCategory); $(".project-software").click(selectProjectSoftwareCheckbox); } - return { init: function(dispatch_ajax) { dispatch_ajax_function = dispatch_ajax; set_events(); - show_head_message(); }, } }); + diff --git a/public/views/search-software-catalog.js b/public/views/search-software-catalog.js index cb3bd01..09dc7ce 100644 --- a/public/views/search-software-catalog.js +++ b/public/views/search-software-catalog.js @@ -161,10 +161,8 @@ modulejs.define('SearchSoftwareCatalog', ['jquery', 'NoosferoRoot', 'SoftwareCat init: function() { set_events(); catalog_message(); - - $("#filter-categories-option").hide(); - SoftwareCatalogComponent.init(dispatch_search_ajax); } } -}); \ No newline at end of file +}); + diff --git a/views/search/_catalog_filter.html.erb b/views/search/_catalog_filter.html.erb index 7ce8d23..9e1ca4d 100644 --- a/views/search/_catalog_filter.html.erb +++ b/views/search/_catalog_filter.html.erb @@ -1,29 +1,23 @@