From: William Boman <william@redwill.se>
Date: Tue, 9 Dec 2014 18:17:31 +0000 (+0100)
Subject: Fix search input hint not clearing properly.
X-Git-Tag: v4.3.0~31^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5178%2Fhead;p=thirdparty%2FFont-Awesome.git

Fix search input hint not clearing properly.
---

diff --git a/src/_includes/icons/filter.html b/src/_includes/icons/filter.html
index a411579632..bf656f4ad1 100644
--- a/src/_includes/icons/filter.html
+++ b/src/_includes/icons/filter.html
@@ -5,10 +5,10 @@
 </div>
 <script>
   try {
-    var filterSet = JSON.parse('{{ icons | flattenIconFilters | jsonify }}');
+    window.filterSet = JSON.parse('{{ icons | flattenIconFilters | jsonify }}');
   } catch (e) {
     console.error('Invalid JSON data!');
-    var filterSet = [];
+    window.filterSet = [];
   }
 </script>
 <{% if page.navbar_active == "icons" %}div{% else %}section{% endif %} id="filter">
diff --git a/src/assets/js/site.js b/src/assets/js/site.js
index 38b6eb07b6..3254a02823 100644
--- a/src/assets/js/site.js
+++ b/src/assets/js/site.js
@@ -21,13 +21,19 @@ $(function() {
       arrowKeys: true
     });
 
-    $clear.click(function(e) {
+    $clear.on('click', function(e) {
       e.preventDefault();
-      $filter_by.val('').trigger('keyup').focus();
+      $filter_by
+        .val('')
+        .trigger('input')
+        .trigger('keyup')
+        .focus();
+
+      $clear.addClass('gone'); // Hide clear button
     });
 
 
-    $filter_by.keyup(function() {
+    $filter_by.on('keyup', function() {
       var $this = $(this);
       var val = $this.val().toLowerCase();
       $filter.toggle(!!val);
@@ -57,7 +63,7 @@ $(function() {
       } else {
         $no_results.hide();
       }
-    }).trigger('keyup');
+    });
   }
 
   function inFilter(val, filter) {