From cfbae4c5d5c63c20b1e143a5e0d4b5a9d6d7a72b Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sun, 26 Jun 2016 14:08:18 +0200
Subject: [PATCH] Update.

---
 src/_h5ai/public/js/lib/ext/filter.js | 19 ++++++-------------
 src/_h5ai/public/js/lib/ext/search.js |  3 +--
 src/_h5ai/public/js/lib/ext/select.js |  7 +++++--
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/_h5ai/public/js/lib/ext/filter.js b/src/_h5ai/public/js/lib/ext/filter.js
index 8b78d06b..95ff0ed3 100644
--- a/src/_h5ai/public/js/lib/ext/filter.js
+++ b/src/_h5ai/public/js/lib/ext/filter.js
@@ -1,4 +1,4 @@
-const {each, debounce} = require('../lo');
+const {filter, debounce} = require('../lo');
 const {dom} = require('../dom');
 const event = require('../core/event');
 const location = require('../core/location');
@@ -25,8 +25,7 @@ let $filter;
 let $input;
 
 
-const filter = pattern => {
-    pattern = pattern || '';
+const filterItems = (pattern = '') => {
     if (pattern === prevPattern) {
         return;
     }
@@ -40,26 +39,20 @@ const filter = pattern => {
     $filter.addCls('pending');
 
     const re = new RegExp(pattern, settings.ignorecase ? 'i' : '');
-    const matchedItems = [];
-
-    each(location.getItem().content, item => {
-        if (re.test(item.label)) {
-            matchedItems.push(item);
-        }
-    });
+    const items = filter(location.getItem().content, item => re.test(item.label));
 
     $filter.rmCls('pending');
     view.setHint('noMatch');
-    view.setItems(matchedItems);
+    view.setItems(items);
 };
 
 const update = () => {
     if (inputIsVisible) {
         $filter.addCls('active');
         $input[0].focus();
-        filter(util.parsePattern($input.val(), settings.advanced));
+        filterItems(util.parsePattern($input.val(), settings.advanced));
     } else {
-        filter();
+        filterItems();
         $filter.rmCls('active');
     }
 };
diff --git a/src/_h5ai/public/js/lib/ext/search.js b/src/_h5ai/public/js/lib/ext/search.js
index df47f05e..d9287024 100644
--- a/src/_h5ai/public/js/lib/ext/search.js
+++ b/src/_h5ai/public/js/lib/ext/search.js
@@ -27,8 +27,7 @@ let $search;
 let $input;
 
 
-const search = pattern => {
-    pattern = pattern || '';
+const search = (pattern = '') => {
     if (pattern === prevPattern) {
         return;
     }
diff --git a/src/_h5ai/public/js/lib/ext/select.js b/src/_h5ai/public/js/lib/ext/select.js
index f8d2123a..7299eb50 100644
--- a/src/_h5ai/public/js/lib/ext/select.js
+++ b/src/_h5ai/public/js/lib/ext/select.js
@@ -11,7 +11,10 @@ const settings = Object.assign({
     clickndrag: false,
     checkboxes: false
 }, allsettings.select);
-const template = '<span class="selector"><img src="' + resource.image('selected') + '" alt="selected"/></span>';
+const selectorTpl =
+        `<span class="selector">
+            <img src="${resource.image('selected')}" alt="selected"/>
+        </span>`;
 let x = 0;
 let y = 0;
 let l = 0;
@@ -148,7 +151,7 @@ function onSelectorClick(ev) {
 
 function addCheckbox(item) {
     if (item.$view && !item.isCurrentParentFolder()) {
-        jq(template)
+        jq(selectorTpl)
             .on('click', onSelectorClick)
             .appendTo(item.$view.find('a'));
     }