Merge branch 'javascript_refactory'

Conflicts: views/search/_catalog_filter.html.erb

Merge branch 'javascript_refactory'
Conflicts: views/search/_catalog_filter.html.erb
Arthur Esposte
2 parents d8f78c16 c8c27930
Showing 7 changed files with 275 additions and 296 deletions Show diff stats
lib/ext/search_controller.rb
lib/software_communities_plugin.rb
public/initializer.js
public/mpog-search.js
public/software-catalog.js
public/views/search-software-catalog.js
views/search/_catalog_filter.html.erb
@@ -73,8 +73,12 @@ class SearchController
     unless category_ids.empty?
       filtered_software_list.select! do |software|
-        result_ids = (software.community.category_ids & category_ids).sort
-        result_ids == category_ids.sort
+        if software.nil? || software.community.nil?
+          false
+        else
+          result_ids = (software.community.category_ids & category_ids).sort
+          result_ids == category_ids.sort
+        end
       end
     end
@@ -150,4 +154,5 @@ class SearchController
       @categories_groupe_two = categories_sliced.next
     end
   end
+
 end
@@ -125,10 +125,9 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
       views/user-edit-profile.js
       views/create-institution.js
       views/complete-registration.js
+      views/search-software-catalog.js
       initializer.js
       app.js
-      mpog-search.js
-      software-catalog.js
       mpog-software-block.js
       mpog-download-block.js
     )
@@ -4,7 +4,8 @@ var dependencies = [
   'NewSoftware',
   'UserEditProfile',
   'CreateInstitution',
-  'CompleteRegistration'
+  'CompleteRegistration',
+  'SearchSoftwareCatalog'
 ];
@@ -1,44 +0,0 @@
-(function(){
-
-  function show_institutions_fields() {
-    jQuery(".institution_fields").show();
-    jQuery(".software_fields").hide();
-    jQuery(".community_fields").hide();
-  }
-
-  function show_software_fields() {
-    jQuery(".institution_fields").hide();
-    jQuery(".software_fields").show();
-    jQuery(".community_fields").hide();
-  }
-
-  function show_community_fields() {
-    jQuery(".institution_fields").hide();
-    jQuery(".software_fields").hide();
-    jQuery(".community_fields").show();
-  }
-
-  function display_search_fields_on_page_load() {
-    var active_search = jQuery(".search_type input[checked='checked']").val();
-
-    switch(active_search) {
-      case "Community": show_community_fields(); break;
-      case "Software": show_software_fields(); break;
-      case "Institution": show_institutions_fields(); break;
-
-      default: show_community_fields();
-    }
-  }
-
-  function set_events() {
-    display_search_fields_on_page_load();
-
-    jQuery("#type_Community").click(show_community_fields);
-
-    jQuery("#type_Software").click(show_software_fields);
-
-    jQuery("#type_Institution").click(show_institutions_fields);
-  }
-
-  jQuery(document).ready(set_events);
-})();
@@ -1,219 +0,0 @@
-(function($){
-  "use strict";
-
-  var AJAX_URL = {
-    software_infos:
-      url_with_subdirectory("/search/software_infos")
-  };
-
-
-  function show_head_message() {
-    if ($("#filter-categories-select-catalog").text()){
-      $("#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);
-    });
-
-    dispatch_search_ajax(update_search_page_on_ajax, true);
-  }
-
-
-  function selectCheckboxCategory() {
-    $("#filter-categories-option").slideUp();
-    $("#filter-categories-select-catalog").show();
-    $("#filter-option-catalog-software").hide();
-
-    dispatch_search_ajax(update_search_page_on_ajax, true);
-  }
-
-
-  function dispatch_search_ajax(callback, enable_load) {
-    var search_params = get_search_params();
-
-    if(enable_load) {
-      open_loading("Loading");
-    }
-
-    $.ajax({
-      url: AJAX_URL.software_infos,
-      type: "GET",
-      data: search_params,
-      success: callback,
-      error: function(){
-        close_loading();
-      }
-    });
-  }
-
-
-  function get_search_params() {
-    var params = {};
-
-    params.query = $("#search-input").val();
-    params.selected_categories = [];
-
-    $(".categories-catalog:checked").each(function(index, element) {
-      params.selected_categories.push(element.value);
-    });
-
-    params.software_display = $("#software_display").val();
-    params.sort = $("#sort").val();
-
-    params.include_non_public = $("#include_non_public").is(":checked");
-
-    return params;
-  }
-
-  function get_result_div_core(message){
-    var div_result = $(".search-results-type-empty");
-    var html = '<div class="search-results-innerbox search-results-type-empty"> <div>'+message+' </div></div>'
-
-    div_result.replaceWith('<div class="search-results-innerbox search-results-type-empty"> <div>Nenhum software encontrado</div> '+message+'</div>')
-  }
-
-  function catalog_message(){
-    var result_list = $("#search-results").find('.search-results-empty').html();
-    var selected_categories_field = $("#filter-categories-select-catalog");
-
-    if(result_list.length > 1 && selected_categories_field.html().length < 1){
-      get_result_div_core("Tente filtros mais abrangentes");
-    }else if (result_list.length > 1 && selected_categories_field.html().length >= 1) {
-      get_result_div_core("Tente filtros mais abrangentes ou confira os <mudar>softwares das categorias individualmente</mudar>");
-    }
-  }
-
-  function update_search_page_on_ajax(response) {
-    response = $(response);
-    var search_list = $("#search-results");
-    var selected_categories_field = $("#filter-categories-select-catalog");
-    var pagination = $("#software-pagination");
-    var software_count = $("#software-count");
-
-    var result_list = response.find("#search-results").html();
-    var result_categories = response.find("#filter-categories-select-catalog").html();
-    var result_pagination = response.find("#software-pagination").html();
-    var result_software_count = response.find("#software-count").html();
-
-    catalog_message()
-
-    search_list.html(result_list);
-    selected_categories_field.html(result_categories);
-    pagination.html(result_pagination);
-    software_count.html(result_software_count);
-    show_head_message();
-    highlight_searched_terms();
-
-    hide_load_after_ajax();
-  }
-
-
-  function hide_load_after_ajax() {
-    if ($("#overlay_loading_modal").is(":visible")) {
-      close_loading();
-      setTimeout(hide_load_after_ajax, 1000);
-    }
-  }
-
-
-  function highlight_searched_terms() {
-    var searched_terms = $("#search-input").val();
-
-    if( searched_terms.length === 0 ) {
-      return undefined;
-    }
-
-    var content_result = $(".search-content-result");
-    var regex = new RegExp("("+searched_terms.replace(/\s/g, "|")+")", "gi");
-
-    content_result.each(function(i, e){
-      var element = $(e);
-
-      var new_text = element.text().replace(regex, function(text) {
-        return "<strong>"+text+"</strong>";
-      });
-
-      element.html(new_text);
-    });
-  }
-
-
-  function selectProjectSoftwareCheckbox() {
-    $("#filter-categories-option").slideUp();
-    $("#filter-categories-select-catalog").show();
-    $("#filter-option-catalog-software").hide();
-
-    dispatch_search_ajax(update_search_page_on_ajax, true);
-    show_head_message();
-  }
-
-  function update_page_by_ajax_on_select_change() {
-    dispatch_search_ajax(update_search_page_on_ajax, true);
-  }
-
-  function update_page_by_text_filter() {
-    var text = this.value;
-    dispatch_search_ajax(update_search_page_on_ajax, false);
-  }
-
-  function search_input_keyup() {
-    var timer = null;
-
-    $("#search-input").keyup(function() {
-        timer = setTimeout(update_page_by_text_filter, 400);
-    }).keydown(function() {
-        clearTimeout(timer);
-    });
-  }
-
-  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);
-    $("#software_display").change(update_page_by_ajax_on_select_change);
-    $("#sort").change(update_page_by_ajax_on_select_change);
-
-    search_input_keyup();
-  }
-
-  $(document).ready(function(){
-    set_events();
-    catalog_message();
-    show_head_message();
-
-
-
-    $("#filter-categories-option").hide();
-  });
-})(jQuery);
@@ -0,0 +1,230 @@
+modulejs.define('SearchSoftwareCatalog', ['jquery', 'NoosferoRoot'], function($, NoosferoRoot) {
+  'use strict';
+
+  var AJAX_URL = {
+    software_infos:
+      NoosferoRoot.urlWithSubDirectory("/search/software_infos")
+  };
+
+
+  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);
+    });
+
+    dispatch_search_ajax(update_search_page_on_ajax, true);
+  }
+
+
+  function selectCheckboxCategory() {
+    $("#filter-categories-option").slideUp();
+    $("#filter-categories-select-catalog").show();
+    $("#filter-option-catalog-software").hide();
+
+    dispatch_search_ajax(update_search_page_on_ajax, true);
+  }
+
+
+  function dispatch_search_ajax(callback, enable_load) {
+    var search_params = get_search_params();
+
+    if(enable_load) {
+      open_loading("Loading");
+    }
+
+    $.ajax({
+      url: AJAX_URL.software_infos,
+      type: "GET",
+      data: search_params,
+      success: callback,
+      error: function(){
+        close_loading();
+      }
+    });
+  }
+
+
+  function get_search_params() {
+    var params = {};
+
+    params.query = $("#search-input").val();
+    params.selected_categories = [];
+
+    $(".categories-catalog:checked").each(function(index, element) {
+      params.selected_categories.push(element.value);
+    });
+
+    params.software_display = $("#software_display").val();
+    params.sort = $("#sort").val();
+
+    params.include_non_public = $("#include_non_public").is(":checked");
+
+    return params;
+  }
+
+
+  function get_result_div_core(message) {
+    $("#search-results-empty").html(message);
+  }
+
+
+  function catalog_message() {
+    var empty_result = $('#empty_result').val() === 'true';
+    var user_selected_categories = $('.categories-catalog:checked').length !== 0;
+
+    if(empty_result && !user_selected_categories) {
+      get_result_div_core($('#message-no-catalog-selected').val());
+    } else if (empty_result && user_selected_categories) {
+      get_result_div_core($('#message-catalog-selected').val());
+    }
+  }
+
+
+  function update_search_page_on_ajax(response) {
+    response = $(response);
+
+    var search_list = $("#search-results");
+    var selected_categories_field = $("#filter-categories-select-catalog");
+    var pagination = $("#software-pagination");
+    var software_count = $("#software-count");
+
+    var result_list = response.find("#search-results").html();
+    var result_categories = response.find("#filter-categories-select-catalog").html();
+    var result_pagination = response.find("#software-pagination").html();
+    var result_software_count = response.find("#software-count").html();
+
+
+
+    search_list.html(result_list);
+    selected_categories_field.html(result_categories);
+    pagination.html(result_pagination);
+    software_count.html(result_software_count);
+    show_head_message();
+    highlight_searched_terms();
+    catalog_message();
+
+    hide_load_after_ajax();
+  }
+
+
+  function hide_load_after_ajax() {
+    if ($("#overlay_loading_modal").is(":visible")) {
+      close_loading();
+      setTimeout(hide_load_after_ajax, 1000);
+    }
+  }
+
+
+  function highlight_searched_terms() {
+    var searched_terms = $("#search-input").val();
+
+    if( searched_terms.length === 0 ) {
+      return undefined;
+    }
+
+    var content_result = $(".search-content-result");
+    var regex = new RegExp("("+searched_terms.replace(/\s/g, "|")+")", "gi");
+
+    content_result.each(function(i, e){
+      var element = $(e);
+
+      var new_text = element.text().replace(regex, function(text) {
+        return "<strong>"+text+"</strong>";
+      });
+
+      element.html(new_text);
+    });
+  }
+
+
+  function selectProjectSoftwareCheckbox() {
+    $("#filter-categories-option").slideUp();
+    $("#filter-categories-select-catalog").show();
+    $("#filter-option-catalog-software").hide();
+
+    dispatch_search_ajax(update_search_page_on_ajax, true);
+    show_head_message();
+  }
+
+
+  function update_page_by_ajax_on_select_change() {
+    dispatch_search_ajax(update_search_page_on_ajax, true);
+  }
+
+  function update_page_by_text_filter() {
+    var text = this.value;
+    dispatch_search_ajax(update_search_page_on_ajax, false);
+  }
+
+
+  function search_input_keyup() {
+    var timer = null;
+
+    $("#search-input").keyup(function() {
+        timer = setTimeout(update_page_by_text_filter, 400);
+    }).keydown(function() {
+        clearTimeout(timer);
+    });
+  }
+
+
+  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);
+    $("#software_display").change(update_page_by_ajax_on_select_change);
+    $("#sort").change(update_page_by_ajax_on_select_change);
+
+    search_input_keyup();
+  }
+
+
+  return {
+    isCurrentPage: function() {
+      return $('#software-search-container').length === 1;
+    },
+
+
+    init: function() {
+      set_events();
+      catalog_message();
+      show_head_message();
+
+      $("#filter-categories-option").hide();
+    }
+  }
+});
 \ No newline at end of file
 <div id="main-content-wrapper-8"> <!-- id do Noosfero -->
-<div id="filter-catalog-software">
+  <div id="filter-catalog-software">
-  <div id="filter-option-catalog-software"><%= _("More options") %></div>
-   <!--Quando tiver filtros(categorias)selecionados mostrar esta opção: Opções selecionadas-->
+    <div id="filter-option-catalog-software"><%= _("More options") %></div>
+     <!--Quando tiver filtros(categorias)selecionados mostrar esta opção: Opções selecionadas-->
-  <div id="filter-categories-select-catalog"><%= @message_selected_options %></div>
+    <div id="filter-categories-select-catalog"><%= @message_selected_options %></div>
-  <div id="filter-categories-option">
+    <div id="filter-categories-option">
-  <div id="filter-categories-catalog"><h4> <%= _("Categories") %> </h4></div>
-    <div id="group-categories">
-      <div id="gruop-catalog-01">
-        <% @categories_groupe_one.each do |category| %>
-          <label>
-            <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
-            <span><%= _("#{category.name}") %></span>
-          </label> <br>
-        <% end %>
-      </div>
-      <div id="group-catalog-02">
-        <% @categories_groupe_two.each do |category| %>
-          <label>
-            <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
-            <%= _("#{category.name}") %>
-          </label> <br>
-        <% end %>
-        <br />
+      <div id="filter-categories-catalog"><h4> <%= _("Categories") %> </h4></div>
+        <div id="group-categories">
+          <div id="gruop-catalog-01">
+            <% @categories_groupe_one.each do |category| %>
+              <label>
+                <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
+                <span><%= _("#{category.name}") %></span>
+              </label> <br>
+            <% end %>
+          </div>
+          <div id="group-catalog-02">
+            <% @categories_groupe_two.each do |category| %>
+              <label>
+                <%= check_box_tag("selected_categories[]", category.id, @selected_categories.include?(category.id), :class => "categories-catalog") %>
+                <%= _("#{category.name}") %>
+              </label> <br>
+            <% end %>
+            <br />
+          </div>
+        </div>
+
+      <div class="project-software"> <%= _("Software Projects:") %>
+        <label>
+          <%= check_box_tag("include_non_public", true, @include_non_public) %>
+          <%= _("Include in results") %>
+        </label>
+        <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
       </div>
+      <br />
+      <%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
+      <%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
     </div>
   <div class="project-software"> <%= _("All Software Projects:") %>
@@ -37,9 +49,4 @@
     </label>
     <span class"doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">(?)</span>
   </div>
-  <br />
-  <%= button_tag _("Clean up"), :id => "cleanup-filter-catalg", :type => "button" %>
-  <%= button_tag _("Close"), :id => "close-filter-catalog", :type => "button" %>
-</div>
-</div>
 </div>
	@@ -4,7 +4,8 @@ var dependencies = [		@@ -4,7 +4,8 @@ var dependencies = [
4	'NewSoftware',	4	'NewSoftware',
5	'UserEditProfile',	5	'UserEditProfile',
6	'CreateInstitution',	6	'CreateInstitution',
7	- 'CompleteRegistration'	7	+ 'CompleteRegistration',
		8	+ 'SearchSoftwareCatalog'
8	];	9	];
9		10
10		11
	@@ -1,44 +0,0 @@	@@ -1,44 +0,0 @@
1	-(function(){
2	-
3	- function show_institutions_fields() {
4	- jQuery(".institution_fields").show();
5	- jQuery(".software_fields").hide();
6	- jQuery(".community_fields").hide();
7	- }
8	-
9	- function show_software_fields() {
10	- jQuery(".institution_fields").hide();
11	- jQuery(".software_fields").show();
12	- jQuery(".community_fields").hide();
13	- }
14	-
15	- function show_community_fields() {
16	- jQuery(".institution_fields").hide();
17	- jQuery(".software_fields").hide();
18	- jQuery(".community_fields").show();
19	- }
20	-
21	- function display_search_fields_on_page_load() {
22	- var active_search = jQuery(".search_type input[checked='checked']").val();
23	-
24	- switch(active_search) {
25	- case "Community": show_community_fields(); break;
26	- case "Software": show_software_fields(); break;
27	- case "Institution": show_institutions_fields(); break;
28	-
29	- default: show_community_fields();
30	- }
31	- }
32	-
33	- function set_events() {
34	- display_search_fields_on_page_load();
35	-
36	- jQuery("#type_Community").click(show_community_fields);
37	-
38	- jQuery("#type_Software").click(show_software_fields);
39	-
40	- jQuery("#type_Institution").click(show_institutions_fields);
41	- }
42	-
43	- jQuery(document).ready(set_events);
44	-})();
	@@ -1,219 +0,0 @@	@@ -1,219 +0,0 @@
1	-(function($){
2	- "use strict";
3	-
4	- var AJAX_URL = {
5	- software_infos:
6	- url_with_subdirectory("/search/software_infos")
7	- };
8	-
9	-
10	- function show_head_message() {
11	- if ($("#filter-categories-select-catalog").text()){
12	- $("#filter-categories-select-catalog").hide();
13	- $("#filter-option-catalog-software").show();
14	- }else{
15	- $("#filter-categories-select-catalog").show();
16	- $("#filter-option-catalog-software").hide();
17	- }
18	- }
19	-
20	-
21	- function slideDowsCategoriesOptionAndHideOptionCatalog() {
22	- $("#filter-categories-option").slideDown();
23	- $("#filter-option-catalog-software").hide();
24	- }
25	-
26	-
27	- function slideDownCategoriesOptionAndHideCategoriesSelect() {
28	- $("#filter-categories-option").slideDown();
29	- $("#filter-categories-select-catalog").hide();
30	- }
31	-
32	-
33	- function slideUpCategoriesAndShowHeadMessage() {
34	- $("#filter-categories-option").slideUp();
35	- show_head_message();
36	- }
37	-
38	-
39	- function clearCatalogCheckbox(){
40	- $("#filter-categories-option").slideUp();
41	- $("#filter-option-catalog-software").show();
42	- $("#group-categories input:checked").each(function() {
43	- $(this).prop('checked', false);
44	- });
45	-
46	- dispatch_search_ajax(update_search_page_on_ajax, true);
47	- }
48	-
49	-
50	- function selectCheckboxCategory() {
51	- $("#filter-categories-option").slideUp();
52	- $("#filter-categories-select-catalog").show();
53	- $("#filter-option-catalog-software").hide();
54	-
55	- dispatch_search_ajax(update_search_page_on_ajax, true);
56	- }
57	-
58	-
59	- function dispatch_search_ajax(callback, enable_load) {
60	- var search_params = get_search_params();
61	-
62	- if(enable_load) {
63	- open_loading("Loading");
64	- }
65	-
66	- $.ajax({
67	- url: AJAX_URL.software_infos,
68	- type: "GET",
69	- data: search_params,
70	- success: callback,
71	- error: function(){
72	- close_loading();
73	- }
74	- });
75	- }
76	-
77	-
78	- function get_search_params() {
79	- var params = {};
80	-
81	- params.query = $("#search-input").val();
82	- params.selected_categories = [];
83	-
84	- $(".categories-catalog:checked").each(function(index, element) {
85	- params.selected_categories.push(element.value);
86	- });
87	-
88	- params.software_display = $("#software_display").val();
89	- params.sort = $("#sort").val();
90	-
91	- params.include_non_public = $("#include_non_public").is(":checked");
92	-
93	- return params;
94	- }
95	-
96	- function get_result_div_core(message){
97	- var div_result = $(".search-results-type-empty");
98	- var html = '<div class="search-results-innerbox search-results-type-empty"> <div>'+message+' </div></div>'
99	-
100	- div_result.replaceWith('<div class="search-results-innerbox search-results-type-empty"> <div>Nenhum software encontrado</div> '+message+'</div>')
101	- }
102	-
103	- function catalog_message(){
104	- var result_list = $("#search-results").find('.search-results-empty').html();
105	- var selected_categories_field = $("#filter-categories-select-catalog");
106	-
107	- if(result_list.length > 1 && selected_categories_field.html().length < 1){
108	- get_result_div_core("Tente filtros mais abrangentes");
109	- }else if (result_list.length > 1 && selected_categories_field.html().length >= 1) {
110	- get_result_div_core("Tente filtros mais abrangentes ou confira os <mudar>softwares das categorias individualmente</mudar>");
111	- }
112	- }
113	-
114	- function update_search_page_on_ajax(response) {
115	- response = $(response);
116	- var search_list = $("#search-results");
117	- var selected_categories_field = $("#filter-categories-select-catalog");
118	- var pagination = $("#software-pagination");
119	- var software_count = $("#software-count");
120	-
121	- var result_list = response.find("#search-results").html();
122	- var result_categories = response.find("#filter-categories-select-catalog").html();
123	- var result_pagination = response.find("#software-pagination").html();
124	- var result_software_count = response.find("#software-count").html();
125	-
126	- catalog_message()
127	-
128	- search_list.html(result_list);
129	- selected_categories_field.html(result_categories);
130	- pagination.html(result_pagination);
131	- software_count.html(result_software_count);
132	- show_head_message();
133	- highlight_searched_terms();
134	-
135	- hide_load_after_ajax();
136	- }
137	-
138	-
139	- function hide_load_after_ajax() {
140	- if ($("#overlay_loading_modal").is(":visible")) {
141	- close_loading();
142	- setTimeout(hide_load_after_ajax, 1000);
143	- }
144	- }
145	-
146	-
147	- function highlight_searched_terms() {
148	- var searched_terms = $("#search-input").val();
149	-
150	- if( searched_terms.length === 0 ) {
151	- return undefined;
152	- }
153	-
154	- var content_result = $(".search-content-result");
155	- var regex = new RegExp("("+searched_terms.replace(/\s/g, "\|")+")", "gi");
156	-
157	- content_result.each(function(i, e){
158	- var element = $(e);
159	-
160	- var new_text = element.text().replace(regex, function(text) {
161	- return "<strong>"+text+"</strong>";
162	- });
163	-
164	- element.html(new_text);
165	- });
166	- }
167	-
168	-
169	- function selectProjectSoftwareCheckbox() {
170	- $("#filter-categories-option").slideUp();
171	- $("#filter-categories-select-catalog").show();
172	- $("#filter-option-catalog-software").hide();
173	-
174	- dispatch_search_ajax(update_search_page_on_ajax, true);
175	- show_head_message();
176	- }
177	-
178	- function update_page_by_ajax_on_select_change() {
179	- dispatch_search_ajax(update_search_page_on_ajax, true);
180	- }
181	-
182	- function update_page_by_text_filter() {
183	- var text = this.value;
184	- dispatch_search_ajax(update_search_page_on_ajax, false);
185	- }
186	-
187	- function search_input_keyup() {
188	- var timer = null;
189	-
190	- $("#search-input").keyup(function() {
191	- timer = setTimeout(update_page_by_text_filter, 400);
192	- }).keydown(function() {
193	- clearTimeout(timer);
194	- });
195	- }
196	-
197	- function set_events() {
198	- $("#filter-option-catalog-software").click(slideDowsCategoriesOptionAndHideOptionCatalog);
199	- $("#filter-categories-select-catalog").click(slideDownCategoriesOptionAndHideCategoriesSelect);
200	- $("#close-filter-catalog").click(slideUpCategoriesAndShowHeadMessage);
201	- $("#cleanup-filter-catalg").click(clearCatalogCheckbox);
202	- $(".categories-catalog").click(selectCheckboxCategory);
203	- $(".project-software").click(selectProjectSoftwareCheckbox);
204	- $("#software_display").change(update_page_by_ajax_on_select_change);
205	- $("#sort").change(update_page_by_ajax_on_select_change);
206	-
207	- search_input_keyup();
208	- }
209	-
210	- $(document).ready(function(){
211	- set_events();
212	- catalog_message();
213	- show_head_message();
214	-
215	-
216	-
217	- $("#filter-categories-option").hide();
218	- });
219	-})(jQuery);
	@@ -0,0 +1,230 @@		@@ -0,0 +1,230 @@
		1	+modulejs.define('SearchSoftwareCatalog', ['jquery', 'NoosferoRoot'], function($, NoosferoRoot) {
		2	+ 'use strict';
		3	+
		4	+ var AJAX_URL = {
		5	+ software_infos:
		6	+ NoosferoRoot.urlWithSubDirectory("/search/software_infos")
		7	+ };
		8	+
		9	+
		10	+ function show_head_message() {
		11	+ if ($("#filter-categories-select-catalog").text().length === 0){
		12	+ $("#filter-categories-select-catalog").hide();
		13	+ $("#filter-option-catalog-software").show();
		14	+ }else{
		15	+ $("#filter-categories-select-catalog").show();
		16	+ $("#filter-option-catalog-software").hide();
		17	+ }
		18	+ }
		19	+
		20	+
		21	+ function slideDowsCategoriesOptionAndHideOptionCatalog() {
		22	+ $("#filter-categories-option").slideDown();
		23	+ $("#filter-option-catalog-software").hide();
		24	+ }
		25	+
		26	+
		27	+ function slideDownCategoriesOptionAndHideCategoriesSelect() {
		28	+ $("#filter-categories-option").slideDown();
		29	+ $("#filter-categories-select-catalog").hide();
		30	+ }
		31	+
		32	+
		33	+ function slideUpCategoriesAndShowHeadMessage() {
		34	+ $("#filter-categories-option").slideUp();
		35	+ show_head_message();
		36	+ }
		37	+
		38	+
		39	+ function clearCatalogCheckbox(){
		40	+ $("#filter-categories-option").slideUp();
		41	+ $("#filter-option-catalog-software").show();
		42	+ $("#group-categories input:checked").each(function() {
		43	+ $(this).prop('checked', false);
		44	+ });
		45	+
		46	+ dispatch_search_ajax(update_search_page_on_ajax, true);
		47	+ }
		48	+
		49	+
		50	+ function selectCheckboxCategory() {
		51	+ $("#filter-categories-option").slideUp();
		52	+ $("#filter-categories-select-catalog").show();
		53	+ $("#filter-option-catalog-software").hide();
		54	+
		55	+ dispatch_search_ajax(update_search_page_on_ajax, true);
		56	+ }
		57	+
		58	+
		59	+ function dispatch_search_ajax(callback, enable_load) {
		60	+ var search_params = get_search_params();
		61	+
		62	+ if(enable_load) {
		63	+ open_loading("Loading");
		64	+ }
		65	+
		66	+ $.ajax({
		67	+ url: AJAX_URL.software_infos,
		68	+ type: "GET",
		69	+ data: search_params,
		70	+ success: callback,
		71	+ error: function(){
		72	+ close_loading();
		73	+ }
		74	+ });
		75	+ }
		76	+
		77	+
		78	+ function get_search_params() {
		79	+ var params = {};
		80	+
		81	+ params.query = $("#search-input").val();
		82	+ params.selected_categories = [];
		83	+
		84	+ $(".categories-catalog:checked").each(function(index, element) {
		85	+ params.selected_categories.push(element.value);
		86	+ });
		87	+
		88	+ params.software_display = $("#software_display").val();
		89	+ params.sort = $("#sort").val();
		90	+
		91	+ params.include_non_public = $("#include_non_public").is(":checked");
		92	+
		93	+ return params;
		94	+ }
		95	+
		96	+
		97	+ function get_result_div_core(message) {
		98	+ $("#search-results-empty").html(message);
		99	+ }
		100	+
		101	+
		102	+ function catalog_message() {
		103	+ var empty_result = $('#empty_result').val() === 'true';
		104	+ var user_selected_categories = $('.categories-catalog:checked').length !== 0;
		105	+
		106	+ if(empty_result && !user_selected_categories) {
		107	+ get_result_div_core($('#message-no-catalog-selected').val());
		108	+ } else if (empty_result && user_selected_categories) {
		109	+ get_result_div_core($('#message-catalog-selected').val());
		110	+ }
		111	+ }
		112	+
		113	+
		114	+ function update_search_page_on_ajax(response) {
		115	+ response = $(response);
		116	+
		117	+ var search_list = $("#search-results");
		118	+ var selected_categories_field = $("#filter-categories-select-catalog");
		119	+ var pagination = $("#software-pagination");
		120	+ var software_count = $("#software-count");
		121	+
		122	+ var result_list = response.find("#search-results").html();
		123	+ var result_categories = response.find("#filter-categories-select-catalog").html();
		124	+ var result_pagination = response.find("#software-pagination").html();
		125	+ var result_software_count = response.find("#software-count").html();
		126	+
		127	+
		128	+
		129	+ search_list.html(result_list);
		130	+ selected_categories_field.html(result_categories);
		131	+ pagination.html(result_pagination);
		132	+ software_count.html(result_software_count);
		133	+ show_head_message();
		134	+ highlight_searched_terms();
		135	+ catalog_message();
		136	+
		137	+ hide_load_after_ajax();
		138	+ }
		139	+
		140	+
		141	+ function hide_load_after_ajax() {
		142	+ if ($("#overlay_loading_modal").is(":visible")) {
		143	+ close_loading();
		144	+ setTimeout(hide_load_after_ajax, 1000);
		145	+ }
		146	+ }
		147	+
		148	+
		149	+ function highlight_searched_terms() {
		150	+ var searched_terms = $("#search-input").val();
		151	+
		152	+ if( searched_terms.length === 0 ) {
		153	+ return undefined;
		154	+ }
		155	+
		156	+ var content_result = $(".search-content-result");
		157	+ var regex = new RegExp("("+searched_terms.replace(/\s/g, "\|")+")", "gi");
		158	+
		159	+ content_result.each(function(i, e){
		160	+ var element = $(e);
		161	+
		162	+ var new_text = element.text().replace(regex, function(text) {
		163	+ return "<strong>"+text+"</strong>";
		164	+ });
		165	+
		166	+ element.html(new_text);
		167	+ });
		168	+ }
		169	+
		170	+
		171	+ function selectProjectSoftwareCheckbox() {
		172	+ $("#filter-categories-option").slideUp();
		173	+ $("#filter-categories-select-catalog").show();
		174	+ $("#filter-option-catalog-software").hide();
		175	+
		176	+ dispatch_search_ajax(update_search_page_on_ajax, true);
		177	+ show_head_message();
		178	+ }
		179	+
		180	+
		181	+ function update_page_by_ajax_on_select_change() {
		182	+ dispatch_search_ajax(update_search_page_on_ajax, true);
		183	+ }
		184	+
		185	+ function update_page_by_text_filter() {
		186	+ var text = this.value;
		187	+ dispatch_search_ajax(update_search_page_on_ajax, false);
		188	+ }
		189	+
		190	+
		191	+ function search_input_keyup() {
		192	+ var timer = null;
		193	+
		194	+ $("#search-input").keyup(function() {
		195	+ timer = setTimeout(update_page_by_text_filter, 400);
		196	+ }).keydown(function() {
		197	+ clearTimeout(timer);
		198	+ });
		199	+ }
		200	+
		201	+
		202	+ function set_events() {
		203	+ $("#filter-option-catalog-software").click(slideDowsCategoriesOptionAndHideOptionCatalog);
		204	+ $("#filter-categories-select-catalog").click(slideDownCategoriesOptionAndHideCategoriesSelect);
		205	+ $("#close-filter-catalog").click(slideUpCategoriesAndShowHeadMessage);
		206	+ $("#cleanup-filter-catalg").click(clearCatalogCheckbox);
		207	+ $(".categories-catalog").click(selectCheckboxCategory);
		208	+ $(".project-software").click(selectProjectSoftwareCheckbox);
		209	+ $("#software_display").change(update_page_by_ajax_on_select_change);
		210	+ $("#sort").change(update_page_by_ajax_on_select_change);
		211	+
		212	+ search_input_keyup();
		213	+ }
		214	+
		215	+
		216	+ return {
		217	+ isCurrentPage: function() {
		218	+ return $('#software-search-container').length === 1;
		219	+ },
		220	+
		221	+
		222	+ init: function() {
		223	+ set_events();
		224	+ catalog_message();
		225	+ show_head_message();
		226	+
		227	+ $("#filter-categories-option").hide();
		228	+ }
		229	+ }
		230	+});
0	\ No newline at end of file	231	\ No newline at end of file