From 5798529fe20fb1fba28e211afeb283bb4a5b991a Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 9 May 2015 17:27:15 +0200
Subject: [PATCH] Refactor code.

---
 src/_h5ai/client/js/inc/core/util.js          | 32 ++++++++++-
 src/_h5ai/client/js/inc/ext/filter.js         | 31 ++---------
 src/_h5ai/client/js/inc/ext/search.js         | 31 ++---------
 src/_h5ai/client/js/lib/lodash-3.8.0.min.js   | 53 +++++++++++++++++++
 .../client/js/lib/lodash-custom-3.8.0.min.js  | 50 -----------------
 src/_h5ai/conf/options.json                   | 28 +++++-----
 6 files changed, 107 insertions(+), 118 deletions(-)
 create mode 100644 src/_h5ai/client/js/lib/lodash-3.8.0.min.js
 delete mode 100644 src/_h5ai/client/js/lib/lodash-custom-3.8.0.min.js

diff --git a/src/_h5ai/client/js/inc/core/util.js b/src/_h5ai/client/js/inc/core/util.js
index 74ed06fc..6ab4f6a5 100644
--- a/src/_h5ai/client/js/inc/core/util.js
+++ b/src/_h5ai/client/js/inc/core/util.js
@@ -1,4 +1,4 @@
-modulejs.define('core/util', [], function () {
+modulejs.define('core/util', ['_'], function (_) {
 
 
     function regularCmpFn(val1, val2) {
@@ -65,9 +65,37 @@ modulejs.define('core/util', [], function () {
         return 0;
     }
 
+    function escapePattern(sequence) {
+
+        return sequence.replace(/[\-\[\]{}()*+?.,\\$\^|#\s]/g, '\\$&');
+    }
+
+    function parsePattern(sequence, advanced) {
+
+        if (!advanced) {
+            return escapePattern(sequence);
+        }
+
+        if (sequence.substr(0, 3) === 're:') {
+            return sequence.substr(3);
+        }
+
+        sequence = _.map(_.trim(sequence).split(/\s+/), function (part) {
+
+            return _.map(part.split(''), function (character) {
+
+                return escapePattern(character);
+            }).join('.*?');
+        }).join('|');
+
+        return sequence;
+    }
+
 
     return {
         regularCmpFn: regularCmpFn,
-        naturalCmpFn: naturalCmpFn
+        naturalCmpFn: naturalCmpFn,
+        escapePattern: escapePattern,
+        parsePattern: parsePattern
     };
 });
diff --git a/src/_h5ai/client/js/inc/ext/filter.js b/src/_h5ai/client/js/inc/ext/filter.js
index 71804755..c79259f5 100644
--- a/src/_h5ai/client/js/inc/ext/filter.js
+++ b/src/_h5ai/client/js/inc/ext/filter.js
@@ -1,8 +1,9 @@
-modulejs.define('ext/filter', ['_', '$', 'core/event', 'core/location', 'core/resource', 'core/settings', 'view/view'], function (_, $, event, location, resource, allsettings, view) {
+modulejs.define('ext/filter', ['_', '$', 'core/event', 'core/location', 'core/resource', 'core/settings', 'core/util', 'view/view'], function (_, $, event, location, resource, allsettings, util, view) {
 
     var settings = _.extend({
             enabled: false,
-            debounceTime: 100
+            debounceTime: 100,
+            advanced: false
         }, allsettings.filter);
     var template =
             '<div id="filter" class="tool">' +
@@ -45,36 +46,12 @@ modulejs.define('ext/filter', ['_', '$', 'core/event', 'core/location', 'core/re
         view.setItems('filter', matchedItems);
     }
 
-    function escapeRegExp(sequence) {
-
-        return sequence.replace(/[\-\[\]{}()*+?.,\\$\^|#\s]/g, '\\$&');
-    }
-
-    function parseInput(sequence) {
-
-        if (sequence.substr(0, 3) === 're:') {
-            return sequence.substr(3);
-        }
-
-        return escapeRegExp(sequence);
-
-        // sequence = $.map($.trim(sequence).split(/\s+/), function (part) {
-
-        //     return _.map(part.split(''), function (character) {
-
-        //         return escapeRegExp(character);
-        //     }).join('.*?');
-        // }).join('|');
-
-        // return sequence;
-    }
-
     function update() {
 
         if (inputIsVisible) {
             $filter.addClass('active');
             $input.focus();
-            filter(parseInput($input.val()));
+            filter(util.parsePattern($input.val(), settings.advanced));
         } else {
             filter();
             $filter.removeClass('active');
diff --git a/src/_h5ai/client/js/inc/ext/search.js b/src/_h5ai/client/js/inc/ext/search.js
index fbc1332d..9f65a438 100644
--- a/src/_h5ai/client/js/inc/ext/search.js
+++ b/src/_h5ai/client/js/inc/ext/search.js
@@ -1,8 +1,9 @@
-modulejs.define('ext/search', ['_', '$', 'core/event', 'core/location', 'core/resource', 'core/server', 'core/settings', 'model/item', 'view/view'], function (_, $, event, location, resource, server, allsettings, Item, view) {
+modulejs.define('ext/search', ['_', '$', 'core/event', 'core/location', 'core/resource', 'core/server', 'core/settings', 'core/util', 'model/item', 'view/view'], function (_, $, event, location, resource, server, allsettings, util, Item, view) {
 
     var settings = _.extend({
             enabled: false,
-            debounceTime: 300
+            debounceTime: 300,
+            advanced: false
         }, allsettings.search);
     var template =
             '<div id="search" class="tool">' +
@@ -47,36 +48,12 @@ modulejs.define('ext/search', ['_', '$', 'core/event', 'core/location', 'core/re
         });
     }
 
-    function escapeRegExp(sequence) {
-
-        return sequence.replace(/[\-\[\]{}()*+?.,\\$\^|#\s]/g, '\\$&');
-    }
-
-    function parseInput(sequence) {
-
-        if (sequence.substr(0, 3) === 're:') {
-            return sequence.substr(3);
-        }
-
-        return escapeRegExp(sequence);
-
-        // sequence = $.map($.trim(sequence).split(/\s+/), function (part) {
-
-        //     return _.map(part.split(''), function (character) {
-
-        //         return escapeRegExp(character);
-        //     }).join('.*?');
-        // }).join('|');
-
-        // return sequence;
-    }
-
     function update() {
 
         if (inputIsVisible) {
             $search.addClass('active');
             $input.focus();
-            search(parseInput($input.val()));
+            search(util.parsePattern($input.val(), settings.advanced));
         } else {
             search();
             $search.removeClass('active');
diff --git a/src/_h5ai/client/js/lib/lodash-3.8.0.min.js b/src/_h5ai/client/js/lib/lodash-3.8.0.min.js
new file mode 100644
index 00000000..a552cabf
--- /dev/null
+++ b/src/_h5ai/client/js/lib/lodash-3.8.0.min.js
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * lodash 3.8.0 (Custom Build) lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
+ * Build: `lodash exports="global" include="compact,contains,debounce,difference,each,extend,filter,indexOf,intersection,isFunction,isNumber,isString,keys,map,pluck,sortBy,trim,values,without"`
+ */
+;(function(){function n(n,r,t){if(r!==r){n:{for(r=n.length,t+=-1;++t<r;){var e=n[t];if(e!==e){n=t;break n}}n=-1}return n}for(t-=1,e=n.length;++t<e;)if(n[t]===r)return t;return-1}function r(n){return typeof n=="function"||false}function t(n){return typeof n=="string"?n:null==n?"":n+""}function e(n,r){for(var t=-1,e=n.length;++t<e&&-1<r.indexOf(n.charAt(t)););return t}function u(n,r){for(var t=n.length;t--&&-1<r.indexOf(n.charAt(t)););return t}function o(n,r){var t;n:{t=n.a;var e=r.a;if(t!==e){var u=t===t,o=e===e;
+
+if(t>e||!u||t===yn&&o){t=1;break n}if(t<e||!o||e===yn&&u){t=-1;break n}}t=0}return t||n.b-r.b}function c(n){return!!n&&typeof n=="object"}function a(n){return 160>=n&&9<=n&&13>=n||32==n||160==n||5760==n||6158==n||8192<=n&&(8202>=n||8232==n||8233==n||8239==n||8287==n||12288==n||65279==n)}function i(n){for(var r=-1,t=n.length;++r<t&&a(n.charCodeAt(r)););return r}function f(n){for(var r=n.length;r--&&a(n.charCodeAt(r)););return r}function l(){}function s(n){var r=n?n.length:0;for(this.data={hash:Ar(null),
+set:new yr};r--;)this.push(n[r])}function p(n,r){var t=n.data;return(typeof r=="string"||en(r)?t.set.has(r):t.hash[r])?0:-1}function h(n,r){var t=-1,e=n.length;for(r||(r=Array(e));++t<e;)r[t]=n[t];return r}function v(n,r){for(var t=-1,e=n.length;++t<e&&false!==r(n[t],t,n););return n}function g(n,r){for(var t=-1,e=n.length,u=-1,o=[];++t<e;){var c=n[t];r(c,t,n)&&(o[++u]=c)}return o}function y(n,r){for(var t=-1,e=n.length,u=Array(e);++t<e;)u[t]=r(n[t],t,n);return u}function b(n,r,t){t||(t={});for(var e=-1,u=r.length;++e<u;){
+var o=r[e];t[o]=n[o]}return t}function m(n,r,t){var e=typeof n;return"function"==e?r===yn?n:M(n,r,t):null==n?hn:"object"==e?T(n):r===yn?gn(n):k(n,r)}function j(n,r,t,e,u,o,c){var a;if(t&&(a=u?t(n,e,u):t(n)),a!==yn)return a;if(!en(n))return n;if(e=qr(n)){if(a=B(n),!r)return h(n,a)}else{var i=ar.call(n),f=i==xn;if(i!=En&&i!=mn&&(!f||u))return Hn[i]?L(n,i,r):u?n:{};if(nr(n))return u?n:{};if(a=D(f?{}:n),!r)return $r(a,n)}for(o||(o=[]),c||(c=[]),u=o.length;u--;)if(o[u]==n)return c[u];return o.push(n),
+c.push(a),(e?v:x)(n,function(e,u){a[u]=j(e,r,t,u,n,o,c)}),a}function d(r,t){var e=r?r.length:0,u=[];if(!e)return u;var o=-1,c=R(),a=c==n,i=a&&200<=t.length?Rr(t):null,f=t.length;i&&(c=p,a=false,t=i);n:for(;++o<e;)if(i=r[o],a&&i===i){for(var l=f;l--;)if(t[l]===i)continue n;u.push(i)}else 0>c(t,i,0)&&u.push(i);return u}function w(n,r){var t=[];return Cr(n,function(n,e,u){r(n,e,u)&&t.push(n)}),t}function A(n,r,t){for(var e=-1,u=n.length,o=-1,a=[];++e<u;){var i=n[e];if(c(i)&&W(i)&&(t||qr(i)||tn(i))){r&&(i=A(i,r,t));
+
+for(var f=-1,l=i.length;++f<l;)a[++o]=i[f]}else t||(a[++o]=i)}return a}function x(n,r){return Nr(n,r,Hr)}function O(n,r,t){if(null!=n){n=H(n),t!==yn&&t in n&&(r=[t]),t=-1;for(var e=r.length;null!=n&&++t<e;)n=H(n)[r[t]];return t&&t==e?n:yn}}function E(n,r,t,e,u,o){if(n===r)return true;var c=typeof n,a=typeof r;if("function"!=c&&"object"!=c&&"function"!=a&&"object"!=a||null==n||null==r)return n!==n&&r!==r;n:{var c=E,a=qr(n),i=qr(r),f=jn,l=jn;a||(f=ar.call(n),f==mn?f=En:f!=En&&(a=cn(n))),i||(l=ar.call(r),
+l==mn?l=En:l!=En&&cn(r));var s=f==En&&!nr(n),i=l==En&&!nr(r),l=f==l;if(!l||a||s){if(!e&&(f=s&&cr.call(n,"__wrapped__"),i=i&&cr.call(r,"__wrapped__"),f||i)){n=c(f?n.value():n,i?r.value():r,t,e,u,o);break n}if(l){for(u||(u=[]),o||(o=[]),f=u.length;f--;)if(u[f]==n){n=o[f]==r;break n}u.push(n),o.push(r),n=(a?U:C)(n,r,c,t,e,u,o),u.pop(),o.pop()}else n=false}else n=$(n,r,f)}return n}function S(n,r){var t=-1,e=W(n)?Array(n.length):[];return Cr(n,function(n,u,o){e[++t]=r(n,u,o)}),e}function T(n){var r=Hr(n),t=r.length;
+
+if(!t)return pn(true);if(1==t){var e=r[0],u=n[e];if(u===u&&!en(u))return function(n){return null==n?false:(n=H(n),n[e]===u&&(u!==yn||e in n))}}for(var o=Array(t),c=Array(t);t--;)u=n[r[t]],o[t]=u,c[t]=u===u&&!en(u);return function(n){var t;if(t=null!=n)n:{n=H(n),t=-1;for(var e=r.length;++t<e;)if(c[t]?o[t]!==n[r[t]]:!(r[t]in n)){t=false;break n}for(t=-1;++t<e;){var u=r[t],a=n[u],i=o[t];if(c[t]?u=a!==yn||u in n:(u=yn,u===yn&&(u=E(i,a,void 0,true))),!u){t=false;break n}}t=true}return t}}function k(n,r){var t=qr(n),e=q(n)&&r===r&&!en(r),u=n+"";
+
+return n=J(n),function(o){if(null==o)return false;var c=u;if(o=H(o),!(!t&&e||c in o)){if(1!=n.length){var c=n,a=0,i=-1,f=-1,l=c.length,a=null==a?0:+a||0;for(0>a&&(a=-a>l?0:l+a),i=i===yn||i>l?l:+i||0,0>i&&(i+=l),l=a>i?0:i-a>>>0,a>>>=0,i=Array(l);++f<l;)i[f]=c[f+a];o=O(o,i)}if(null==o)return false;c=Q(n),o=H(o)}return o[c]===r?r!==yn||c in o:E(r,o[c],null,true)}}function I(n){return function(r){return null==r?yn:H(r)[n]}}function P(n){var r=n+"";return n=J(n),function(t){return O(t,n,r)}}function _(n,r){var t=n.length;
+
+for(n.sort(r);t--;)n[t]=n[t].c;return n}function M(n,r,t){if(typeof n!="function")return hn;if(r===yn)return n;switch(t){case 1:return function(t){return n.call(r,t)};case 3:return function(t,e,u){return n.call(r,t,e,u)};case 4:return function(t,e,u,o){return n.call(r,t,e,u,o)};case 5:return function(t,e,u,o,c){return n.call(r,t,e,u,o,c)}}return function(){return n.apply(r,arguments)}}function F(n){return lr.call(n,0)}function U(n,r,t,e,u,o,c){var a=-1,i=n.length,f=r.length,l=true;if(i!=f&&(!u||f<=i))return false;
+
+for(;l&&++a<i;){var s=n[a],p=r[a],l=yn;if(e&&(l=u?e(p,s,a):e(s,p,a)),l===yn)if(u)for(var h=f;h--&&(p=r[h],!(l=s&&s===p||t(s,p,e,u,o,c))););else l=s&&s===p||t(s,p,e,u,o,c)}return!!l}function $(n,r,t){switch(t){case dn:case wn:return+n==+r;case An:return n.name==r.name&&n.message==r.message;case On:return n!=+n?r!=+r:n==+r;case Sn:case Tn:return n==r+""}return false}function C(n,r,t,e,u,o,c){var a=Hr(n),i=a.length,f=Hr(r).length;if(i!=f&&!u)return false;for(var f=u,l=-1;++l<i;){var s=a[l],p=u?s in r:cr.call(r,s);
+
+if(p){var h=n[s],v=r[s],p=yn;e&&(p=u?e(v,h,s):e(h,v,s)),p===yn&&(p=h&&h===v||t(h,v,e,u,o,c))}if(!p)return false;f||(f="constructor"==s)}return f||(t=n.constructor,e=r.constructor,!(t!=e&&"constructor"in n&&"constructor"in r)||typeof t=="function"&&t instanceof t&&typeof e=="function"&&e instanceof e)?true:false}function N(n,r,t){var e=l.callback||sn,e=e===sn?m:e;return t?e(n,r,t):e}function R(r,t,e){var u=l.indexOf||K,u=u===K?n:u;return r?u(r,t,e):u}function B(n){var r=n.length,t=new n.constructor(r);return r&&"string"==typeof n[0]&&cr.call(n,"index")&&(t.index=n.index,
+t.input=n.input),t}function D(n){return n=n.constructor,typeof n=="function"&&n instanceof n||(n=Object),new n}function L(n,r,t){var e=n.constructor;switch(r){case kn:return F(n);case dn:case wn:return new e(+n);case In:case Pn:case _n:case Mn:case Fn:case Un:case $n:case Cn:case Nn:return e instanceof e&&(e=Mr[r]),r=n.buffer,new e(t?F(r):r,n.byteOffset,n.length);case On:case Tn:return new e(n);case Sn:var u=new e(n.source,Yn.exec(n));u.lastIndex=n.lastIndex}return u}function W(n){return null!=n&&z(Br(n));
+
+}function V(n,r){return n=+n,r=null==r?_r:r,-1<n&&0==n%1&&n<r}function Y(n,r,t){if(!en(t))return false;var e=typeof r;return("number"==e?W(t)&&V(r,t.length):"string"==e&&r in t)?(r=t[r],n===n?n===r:r!==r):false}function q(n,r){var t=typeof n;return"string"==t&&Bn.test(n)||"number"==t?true:qr(n)?false:!Rn.test(n)||null!=r&&n in H(r)}function z(n){return typeof n=="number"&&-1<n&&0==n%1&&n<=_r}function G(n){for(var r=an(n),t=r.length,e=t&&n.length,u=l.support,u=e&&z(e)&&(qr(n)||u.nonEnumStrings&&on(n)||u.nonEnumArgs&&tn(n)),o=-1,c=[];++o<t;){
+var a=r[o];(u&&V(a,e)||cr.call(n,a))&&c.push(a)}return c}function H(n){if(l.support.unindexedChars&&on(n)){for(var r=-1,t=n.length,e=Object(n);++r<t;)e[r]=n.charAt(r);return e}return en(n)?n:Object(n)}function J(n){if(qr(n))return n;var r=[];return t(n).replace(Dn,function(n,t,e,u){r.push(e?u.replace(Vn,"$1"):t||n)}),r}function K(r,t,e){var u=r?r.length:0;if(!u)return-1;if(typeof e=="number")e=0>e?Or(u+e,0):e;else if(e){if(e=0,u=r?r.length:e,typeof t!="number"||t!==t||u>Ir){u=hn,e=u(t);for(var o=0,c=r?r.length:0,a=e!==e,i=e===yn;o<c;){
+var f=sr((o+c)/2),l=u(r[f]),s=l===l;(a?s:i?s&&l!==yn:l<e)?o=f+1:c=f}e=Er(c,kr)}else{for(;e<u;){var o=e+u>>>1;r[o]<t?e=o+1:u=o}e=u}return r=r[e],(t===t?t===r:r!==r)?e:-1}return n(r,t,e||0)}function Q(n){var r=n?n.length:0;return r?n[r-1]:yn}function X(n,r,t){var e=qr(n)?g:w;return r=N(r,t,3),e(n,r)}function Z(n,r,t,e){var u=n?Br(n):0;return z(u)||(n=fn(n),u=n.length),u?(t=typeof t!="number"||e&&Y(r,t,e)?0:0>t?Or(u+t,0):t||0,typeof n=="string"||!qr(n)&&on(n)?t<u&&-1<n.indexOf(r,t):-1<R(n,r,t)):false}function nn(n,r,t){
+var e=qr(n)?y:S;return r=N(r,t,3),e(n,r)}function rn(n,r){if(typeof n!="function")throw new TypeError(bn);return r=Or(r===yn?n.length-1:+r||0,0),function(){for(var t=arguments,e=-1,u=Or(t.length-r,0),o=Array(u);++e<u;)o[e]=t[r+e];switch(r){case 0:return n.call(this,o);case 1:return n.call(this,t[0],o);case 2:return n.call(this,t[0],t[1],o)}for(u=Array(r+1),e=-1;++e<r;)u[e]=t[e];return u[r]=o,n.apply(this,u)}}function tn(n){return c(n)&&W(n)&&ar.call(n)==mn}function en(n){var r=typeof n;return"function"==r||!!n&&"object"==r;
+
+}function un(n){return null==n?false:ar.call(n)==xn?ir.test(or.call(n)):c(n)&&(nr(n)?ir:qn).test(n)}function on(n){return typeof n=="string"||c(n)&&ar.call(n)==Tn}function cn(n){return c(n)&&z(n.length)&&!!Gn[ar.call(n)]}function an(n){if(null==n)return[];en(n)||(n=Object(n));for(var r=n.length,t=l.support,r=r&&z(r)&&(qr(n)||t.nonEnumStrings&&on(n)||t.nonEnumArgs&&tn(n))&&r||0,e=n.constructor,u=-1,e=zr(e)&&e.prototype||er,o=e===n,c=Array(r),a=0<r,i=t.enumErrorProps&&(n===tr||n instanceof Error),f=t.enumPrototypes&&zr(n);++u<r;)c[u]=u+"";
+
+for(var s in n)f&&"prototype"==s||i&&("message"==s||"name"==s)||a&&V(s,r)||"constructor"==s&&(o||!cr.call(n,s))||c.push(s);if(t.nonEnumShadows&&n!==er)for(r=n===ur?Tn:n===tr?An:ar.call(n),t=Fr[r]||Fr[En],r==En&&(e=er),r=zn.length;r--;)s=zn[r],u=t[s],o&&u||(u?!cr.call(n,s):n[s]===e[s])||c.push(s);return c}function fn(n){for(var r=Hr(n),t=-1,e=r.length,u=Array(e);++t<e;)u[t]=n[r[t]];return u}function ln(n){return(n=t(n))&&Wn.test(n)?n.replace(Ln,"\\$&"):n}function sn(n,r,t){return t&&Y(n,r,t)&&(r=null),
+c(n)?vn(n):m(n,r)}function pn(n){return function(){return n}}function hn(n){return n}function vn(n){return T(j(n,true))}function gn(n){return q(n)?I(n):P(n)}var yn,bn="Expected a function",mn="[object Arguments]",jn="[object Array]",dn="[object Boolean]",wn="[object Date]",An="[object Error]",xn="[object Function]",On="[object Number]",En="[object Object]",Sn="[object RegExp]",Tn="[object String]",kn="[object ArrayBuffer]",In="[object Float32Array]",Pn="[object Float64Array]",_n="[object Int8Array]",Mn="[object Int16Array]",Fn="[object Int32Array]",Un="[object Uint8Array]",$n="[object Uint8ClampedArray]",Cn="[object Uint16Array]",Nn="[object Uint32Array]",Rn=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\n\\]|\\.)*?\1)\]/,Bn=/^\w*$/,Dn=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g,Ln=/[.*+?^${}()|[\]\/\\]/g,Wn=RegExp(Ln.source),Vn=/\\(\\)?/g,Yn=/\w*$/,qn=/^\[object .+?Constructor\]$/,zn="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),Gn={};
+
+Gn[In]=Gn[Pn]=Gn[_n]=Gn[Mn]=Gn[Fn]=Gn[Un]=Gn[$n]=Gn[Cn]=Gn[Nn]=true,Gn[mn]=Gn[jn]=Gn[kn]=Gn[dn]=Gn[wn]=Gn[An]=Gn[xn]=Gn["[object Map]"]=Gn[On]=Gn[En]=Gn[Sn]=Gn["[object Set]"]=Gn[Tn]=Gn["[object WeakMap]"]=false;var Hn={};Hn[mn]=Hn[jn]=Hn[kn]=Hn[dn]=Hn[wn]=Hn[In]=Hn[Pn]=Hn[_n]=Hn[Mn]=Hn[Fn]=Hn[On]=Hn[En]=Hn[Sn]=Hn[Tn]=Hn[Un]=Hn[$n]=Hn[Cn]=Hn[Nn]=true,Hn[An]=Hn[xn]=Hn["[object Map]"]=Hn["[object Set]"]=Hn["[object WeakMap]"]=false;var Jn={"function":true,object:true},Kn=Jn[typeof module]&&module&&!module.nodeType&&module,Qn=Jn[typeof self]&&self&&self.Object&&self,Xn=Jn[typeof window]&&window&&window.Object&&window,Zn=Jn[typeof exports]&&exports&&!exports.nodeType&&exports&&Kn&&typeof global=="object"&&global&&global.Object&&global||Xn!==(this&&this.window)&&Xn||Qn||this,nr=function(){
+try{Object({toString:0}+"")}catch(n){return function(){return false}}return function(n){return typeof n.toString!="function"&&typeof(n+"")=="string"}}(),rr=Array.prototype,tr=Error.prototype,er=Object.prototype,ur=String.prototype,or=Function.prototype.toString,cr=er.hasOwnProperty,ar=er.toString,ir=RegExp("^"+ln(ar).replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),fr=un(fr=Zn.ArrayBuffer)&&fr,lr=un(lr=fr&&new fr(0).slice)&&lr,sr=Math.floor,pr=un(pr=Object.getOwnPropertySymbols)&&pr,hr=rr.push,vr=un(vr=Object.preventExtensions)&&vr,gr=er.propertyIsEnumerable,yr=un(yr=Zn.Set)&&yr,br=rr.splice,mr=un(mr=Zn.Uint8Array)&&mr,jr=function(){
+try{var n=un(n=Zn.Float64Array)&&n,r=new n(new fr(10),0,1)&&n}catch(t){}return r}(),dr=function(){var n=vr&&un(n=Object.assign)&&n;try{if(n){var r=vr({1:0});r[0]=1}}catch(t){try{n(r,"xo")}catch(e){}return!r[1]&&n}return false}(),wr=un(wr=Array.isArray)&&wr,Ar=un(Ar=Object.create)&&Ar,xr=un(xr=Object.keys)&&xr,Or=Math.max,Er=Math.min,Sr=un(Sr=Date.now)&&Sr,Tr=Math.pow(2,32)-1,kr=Tr-1,Ir=Tr>>>1,Pr=jr?jr.BYTES_PER_ELEMENT:0,_r=Math.pow(2,53)-1,Mr={};Mr[In]=Zn.Float32Array,Mr[Pn]=Zn.Float64Array,Mr[_n]=Zn.Int8Array,
+Mr[Mn]=Zn.Int16Array,Mr[Fn]=Zn.Int32Array,Mr[Un]=Zn.Uint8Array,Mr[$n]=Zn.Uint8ClampedArray,Mr[Cn]=Zn.Uint16Array,Mr[Nn]=Zn.Uint32Array;var Fr={};Fr[jn]=Fr[wn]=Fr[On]={constructor:true,toLocaleString:true,toString:true,valueOf:true},Fr[dn]=Fr[Tn]={constructor:true,toString:true,valueOf:true},Fr[An]=Fr[xn]=Fr[Sn]={constructor:true,toString:true},Fr[En]={constructor:true},v(zn,function(n){for(var r in Fr)if(cr.call(Fr,r)){var t=Fr[r];t[n]=cr.call(t,n)}});var Ur=l.support={};!function(n){var r=function(){this.x=n},t=arguments,e={
+0:n,length:n},u=[];r.prototype={valueOf:n,y:n};for(var o in new r)u.push(o);Ur.argsTag=ar.call(t)==mn,Ur.enumErrorProps=gr.call(tr,"message")||gr.call(tr,"name"),Ur.enumPrototypes=gr.call(r,"prototype"),Ur.funcDecomp=/\bthis\b/.test(function(){return this}),Ur.funcNames=typeof Function.name=="string",Ur.nonEnumStrings=!gr.call("x",0),Ur.nonEnumShadows=!/valueOf/.test(u),Ur.spliceObjects=(br.call(e,0,1),!e[0]),Ur.unindexedChars="xx"!="x"[0]+Object("x")[0];try{Ur.nonEnumArgs=!gr.call(t,1)}catch(c){
+Ur.nonEnumArgs=true}}(1,0);var $r=dr||function(n,r){return null==r?n:b(r,Dr(r),b(r,Hr(r),n))},Cr=function(n,r){return function(t,e){var u=t?Br(t):0;if(!z(u))return n(t,e);for(var o=r?u:-1,c=H(t);(r?o--:++o<u)&&false!==e(c[o],o,c););return t}}(x),Nr=function(n){return function(r,t,e){var u=H(r);e=e(r);for(var o=e.length,c=n?o:-1;n?c--:++c<o;){var a=e[c];if(false===t(u[a],a,u))break}return r}}();lr||(F=fr&&mr?function(n){var r=n.byteLength,t=jr?sr(r/Pr):0,e=t*Pr,u=new fr(r);if(t){var o=new jr(u,0,t);o.set(new jr(n,0,t));
+
+}return r!=e&&(o=new mr(u,e),o.set(new mr(n,e))),u}:pn(null));var Rr=Ar&&yr?function(n){return new s(n)}:pn(null),Br=I("length"),Dr=pr?function(n){return pr(H(n))}:pn([]),Lr=rn(function(n,r){return W(n)?d(n,A(r,false,true)):[]}),Wr=rn(function(n,r){return W(n)?d(n,r):[]}),Vr=function(n,r){return function(t,e,u){return typeof e=="function"&&u===yn&&qr(t)?n(t,e):r(t,M(e,u,3))}}(v,Cr),Yr=Sr||function(){return(new Date).getTime()};Ur.argsTag||(tn=function(n){return c(n)&&W(n)&&cr.call(n,"callee")&&!gr.call(n,"callee");
+
+});var qr=wr||function(n){return c(n)&&z(n.length)&&ar.call(n)==jn},zr=r(/x/)||mr&&!r(mr)?function(n){return ar.call(n)==xn}:r,Gr=function(n){return rn(function(r,t){var e=-1,u=null==r?0:t.length,o=2<u&&t[u-2],c=2<u&&t[2],a=1<u&&t[u-1];for(typeof o=="function"?(o=M(o,a,5),u-=2):(o=typeof a=="function"?a:null,u-=o?1:0),c&&Y(t[0],t[1],c)&&(o=3>u?null:o,u=1);++e<u;)(c=t[e])&&n(r,c,o);return r})}(function(n,r,t){if(t){var e=Hr(r);hr.apply(e,Dr(r));for(var u=-1,o=e.length;++u<o;){var c=e[u],a=n[c],i=t(a,r[c],c,n,r);
+
+(i===i?i===a:a!==a)&&(a!==yn||c in n)||(n[c]=i)}}else n=$r(n,r);return n}),Hr=xr?function(n){var r=null!=n&&n.constructor;return typeof r=="function"&&r.prototype===n||(typeof n=="function"?l.support.enumPrototypes:W(n))?G(n):en(n)?xr(n):[]}:G;s.prototype.push=function(n){var r=this.data;typeof n=="string"||en(n)?r.set.add(n):r.hash[n]=true},l.assign=Gr,l.callback=sn,l.compact=function(n){for(var r=-1,t=n?n.length:0,e=-1,u=[];++r<t;){var o=n[r];o&&(u[++e]=o)}return u},l.constant=pn,l.debounce=function(n,r,t){
+function e(){var t=r-(Yr()-f);0>=t||t>r?(a&&clearTimeout(a),t=p,a=s=p=yn,t&&(h=Yr(),i=n.apply(l,c),s||a||(c=l=null))):s=setTimeout(e,t)}function u(){s&&clearTimeout(s),a=s=p=yn,(g||v!==r)&&(h=Yr(),i=n.apply(l,c),s||a||(c=l=null))}function o(){if(c=arguments,f=Yr(),l=this,p=g&&(s||!y),false===v)var t=y&&!s;else{a||y||(h=f);var o=v-(f-h),b=0>=o||o>v;b?(a&&(a=clearTimeout(a)),h=f,i=n.apply(l,c)):a||(a=setTimeout(u,o))}return b&&s?s=clearTimeout(s):s||r===v||(s=setTimeout(e,r)),t&&(b=true,i=n.apply(l,c)),
+!b||s||a||(c=l=null),i}var c,a,i,f,l,s,p,h=0,v=false,g=true;if(typeof n!="function")throw new TypeError(bn);if(r=0>r?0:+r||0,true===t)var y=true,g=false;else en(t)&&(y=t.leading,v="maxWait"in t&&Or(+t.maxWait||0,r),g="trailing"in t?t.trailing:g);return o.cancel=function(){s&&clearTimeout(s),a&&clearTimeout(a),a=s=p=yn},o},l.difference=Lr,l.filter=X,l.forEach=Vr,l.intersection=function(){for(var r=[],t=-1,e=arguments.length,u=[],o=R(),c=o==n,a=[];++t<e;){var i=arguments[t];W(i)&&(r.push(i),u.push(c&&120<=i.length?Rr(t&&i):null));
+
+}if(e=r.length,2>e)return a;var c=r[0],f=-1,l=c?c.length:0,s=u[0];n:for(;++f<l;)if(i=c[f],0>(s?p(s,i):o(a,i,0))){for(t=e;--t;){var h=u[t];if(0>(h?p(h,i):o(r[t],i,0)))continue n}s&&s.push(i),a.push(i)}return a},l.keys=Hr,l.keysIn=an,l.map=nn,l.matches=vn,l.pluck=function(n,r){return nn(n,gn(r))},l.property=gn,l.restParam=rn,l.sortBy=function(n,r,t){if(null==n)return[];t&&Y(n,r,t)&&(r=null);var e=-1;return r=N(r,t,3),n=S(n,function(n,t,u){return{a:r(n,t,u),b:++e,c:n}}),_(n,o)},l.values=fn,l.without=Wr,
+l.collect=nn,l.each=Vr,l.extend=Gr,l.iteratee=sn,l.select=X,l.escapeRegExp=ln,l.identity=hn,l.includes=Z,l.indexOf=K,l.isArguments=tn,l.isArray=qr,l.isFunction=zr,l.isNative=un,l.isNumber=function(n){return typeof n=="number"||c(n)&&ar.call(n)==On},l.isObject=en,l.isString=on,l.isTypedArray=cn,l.last=Q,l.now=Yr,l.trim=function(n,r,o){var c=n;return(n=t(n))?(o?Y(c,r,o):null==r)?n.slice(i(n),f(n)+1):(r+="",n.slice(e(n,r),u(n,r)+1)):n},l.contains=Z,l.include=Z,l.VERSION="3.8.0",Zn._=l}).call(this);
\ No newline at end of file
diff --git a/src/_h5ai/client/js/lib/lodash-custom-3.8.0.min.js b/src/_h5ai/client/js/lib/lodash-custom-3.8.0.min.js
deleted file mode 100644
index bb92da3f..00000000
--- a/src/_h5ai/client/js/lib/lodash-custom-3.8.0.min.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @license
- * lodash 3.8.0 (Custom Build) lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
- * Build: `lodash exports="global" include="compact,contains,debounce,difference,each,extend,filter,indexOf,intersection,isFunction,isNumber,isString,keys,map,pluck,sortBy,values,without"`
- */
-;(function(){function n(n,r,t){if(r!==r){n:{for(r=n.length,t+=-1;++t<r;){var e=n[t];if(e!==e){n=t;break n}}n=-1}return n}for(t-=1,e=n.length;++t<e;)if(n[t]===r)return t;return-1}function r(n){return typeof n=="function"||false}function t(n){return typeof n=="string"?n:null==n?"":n+""}function e(n,r){var t;n:{t=n.a;var e=r.a;if(t!==e){var u=t===t,o=e===e;if(t>e||!u||t===sn&&o){t=1;break n}if(t<e||!o||e===sn&&u){t=-1;break n}}t=0}return t||n.b-r.b}function u(n){return!!n&&typeof n=="object"}function o(){}
-function c(n){var r=n?n.length:0;for(this.data={hash:br(null),set:new sr};r--;)this.push(n[r])}function a(n,r){var t=n.data;return(typeof r=="string"||X(r)?t.set.has(r):t.hash[r])?0:-1}function i(n,r){var t=-1,e=n.length;for(r||(r=Array(e));++t<e;)r[t]=n[t];return r}function f(n,r){for(var t=-1,e=n.length;++t<e&&false!==r(n[t],t,n););return n}function l(n,r){for(var t=-1,e=n.length,u=-1,o=[];++t<e;){var c=n[t];r(c,t,n)&&(o[++u]=c)}return o}function s(n,r){for(var t=-1,e=n.length,u=Array(e);++t<e;)u[t]=r(n[t],t,n);
-
-return u}function p(n,r,t){t||(t={});for(var e=-1,u=r.length;++e<u;){var o=r[e];t[o]=n[o]}return t}function h(n,r,t){var e=typeof n;return"function"==e?r===sn?n:T(n,r,t):null==n?an:"object"==e?A(n):r===sn?ln(n):x(n,r)}function y(n,r,t,e,u,o,c){var a;if(t&&(a=u?t(n,e,u):t(n)),a!==sn)return a;if(!X(n))return n;if(e=Dr(n)){if(a=U(n),!r)return i(n,a)}else{var l=tr.call(n),s=l==mn;if(l!=wn&&l!=hn&&(!s||u))return Vn[l]?N(n,l,r):u?n:{};if(Jn(n))return u?n:{};if(a=$(s?{}:n),!r)return Pr(a,n)}for(o||(o=[]),
-c||(c=[]),u=o.length;u--;)if(o[u]==n)return c[u];return o.push(n),c.push(a),(e?f:m)(n,function(e,u){a[u]=y(e,r,t,u,n,o,c)}),a}function g(r,t){var e=r?r.length:0,u=[];if(!e)return u;var o=-1,c=F(),i=c==n,f=i&&200<=t.length?Fr(t):null,l=t.length;f&&(c=a,i=false,t=f);n:for(;++o<e;)if(f=r[o],i&&f===f){for(var s=l;s--;)if(t[s]===f)continue n;u.push(f)}else 0>c(t,f,0)&&u.push(f);return u}function v(n,r){var t=[];return _r(n,function(n,e,u){r(n,e,u)&&t.push(n)}),t}function b(n,r,t){for(var e=-1,o=n.length,c=-1,a=[];++e<o;){
-var i=n[e];if(u(i)&&R(i)&&(t||Dr(i)||Q(i))){r&&(i=b(i,r,t));for(var f=-1,l=i.length;++f<l;)a[++c]=i[f]}else t||(a[++c]=i)}return a}function m(n,r){return Mr(n,r,Vr)}function j(n,r,t){if(null!=n){n=V(n),t!==sn&&t in n&&(r=[t]),t=-1;for(var e=r.length;null!=n&&++t<e;)n=V(n)[r[t]];return t&&t==e?n:sn}}function w(n,r,t,e,u,o){if(n===r)return true;var c=typeof n,a=typeof r;if("function"!=c&&"object"!=c&&"function"!=a&&"object"!=a||null==n||null==r)n=n!==n&&r!==r;else n:{var c=w,a=Dr(n),i=Dr(r),f=yn,l=yn;
-a||(f=tr.call(n),f==hn?f=wn:f!=wn&&(a=rn(n))),i||(l=tr.call(r),l==hn?l=wn:l!=wn&&rn(r));var s=f==wn&&!Jn(n),i=l==wn&&!Jn(r),l=f==l;if(!l||a||s){if(!e&&(f=s&&rr.call(n,"__wrapped__"),i=i&&rr.call(r,"__wrapped__"),f||i)){n=c(f?n.value():n,i?r.value():r,t,e,u,o);break n}if(l){for(u||(u=[]),o||(o=[]),f=u.length;f--;)if(u[f]==n){n=o[f]==r;break n}u.push(n),o.push(r),n=(a?I:_)(n,r,c,t,e,u,o),u.pop(),o.pop()}else n=false}else n=P(n,r,f)}return n}function d(n,r){var t=-1,e=R(n)?Array(n.length):[];return _r(n,function(n,u,o){
-e[++t]=r(n,u,o)}),e}function A(n){var r=Vr(n),t=r.length;if(!t)return cn(true);if(1==t){var e=r[0],u=n[e];if(u===u&&!X(u))return function(n){return null==n?false:(n=V(n),n[e]===u&&(u!==sn||e in n))}}for(var o=Array(t),c=Array(t);t--;)u=n[r[t]],o[t]=u,c[t]=u===u&&!X(u);return function(n){var t;if(t=null!=n)n:{n=V(n),t=-1;for(var e=r.length;++t<e;)if(c[t]?o[t]!==n[r[t]]:!(r[t]in n)){t=false;break n}for(t=-1;++t<e;){var u=r[t],a=n[u],i=o[t];if(c[t]?u=a!==sn||u in n:(u=sn,u===sn&&(u=w(i,a,void 0,true))),!u){t=false;
-
-break n}}t=true}return t}}function x(n,r){var t=Dr(n),e=D(n)&&r===r&&!X(r),u=n+"";return n=Y(n),function(o){if(null==o)return false;var c=u;if(o=V(o),!(!t&&e||c in o)){if(1!=n.length){var c=n,a=0,i=-1,f=-1,l=c.length,a=null==a?0:+a||0;for(0>a&&(a=-a>l?0:l+a),i=i===sn||i>l?l:+i||0,0>i&&(i+=l),l=a>i?0:i-a>>>0,a>>>=0,i=Array(l);++f<l;)i[f]=c[f+a];o=j(o,i)}if(null==o)return false;c=z(n),o=V(o)}return o[c]===r?r!==sn||c in o:w(r,o[c],null,true)}}function O(n){return function(r){return null==r?sn:V(r)[n]}}function E(n){
-var r=n+"";return n=Y(n),function(t){return j(t,n,r)}}function S(n,r){var t=n.length;for(n.sort(r);t--;)n[t]=n[t].c;return n}function T(n,r,t){if(typeof n!="function")return an;if(r===sn)return n;switch(t){case 1:return function(t){return n.call(r,t)};case 3:return function(t,e,u){return n.call(r,t,e,u)};case 4:return function(t,e,u,o){return n.call(r,t,e,u,o)};case 5:return function(t,e,u,o,c){return n.call(r,t,e,u,o,c)}}return function(){return n.apply(r,arguments)}}function k(n){return or.call(n,0);
-
-}function I(n,r,t,e,u,o,c){var a=-1,i=n.length,f=r.length,l=true;if(i!=f&&(!u||f<=i))return false;for(;l&&++a<i;){var s=n[a],p=r[a],l=sn;if(e&&(l=u?e(p,s,a):e(s,p,a)),l===sn)if(u)for(var h=f;h--&&(p=r[h],!(l=s&&s===p||t(s,p,e,u,o,c))););else l=s&&s===p||t(s,p,e,u,o,c)}return!!l}function P(n,r,t){switch(t){case gn:case vn:return+n==+r;case bn:return n.name==r.name&&n.message==r.message;case jn:return n!=+n?r!=+r:n==+r;case dn:case An:return n==r+""}return false}function _(n,r,t,e,u,o,c){var a=Vr(n),i=a.length,f=Vr(r).length;
-
-if(i!=f&&!u)return false;for(var f=u,l=-1;++l<i;){var s=a[l],p=u?s in r:rr.call(r,s);if(p){var h=n[s],y=r[s],p=sn;e&&(p=u?e(y,h,s):e(h,y,s)),p===sn&&(p=h&&h===y||t(h,y,e,u,o,c))}if(!p)return false;f||(f="constructor"==s)}return f||(t=n.constructor,e=r.constructor,!(t!=e&&"constructor"in n&&"constructor"in r)||typeof t=="function"&&t instanceof t&&typeof e=="function"&&e instanceof e)?true:false}function M(n,r){var t=o.callback||on,t=t===on?h:t;return t(n,r,3)}function F(r,t,e){var u=o.indexOf||q,u=u===q?n:u;return r?u(r,t,e):u;
-
-}function U(n){var r=n.length,t=new n.constructor(r);return r&&"string"==typeof n[0]&&rr.call(n,"index")&&(t.index=n.index,t.input=n.input),t}function $(n){return n=n.constructor,typeof n=="function"&&n instanceof n||(n=Object),new n}function N(n,r,t){var e=n.constructor;switch(r){case xn:return k(n);case gn:case vn:return new e(+n);case On:case En:case Sn:case Tn:case kn:case In:case Pn:case _n:case Mn:return e instanceof e&&(e=Tr[r]),r=n.buffer,new e(t?k(r):r,n.byteOffset,n.length);case jn:case An:
-return new e(n);case dn:var u=new e(n.source,Cn.exec(n));u.lastIndex=n.lastIndex}return u}function R(n){return null!=n&&L(Ur(n))}function B(n,r){return n=+n,r=null==r?Sr:r,-1<n&&0==n%1&&n<r}function C(n,r,t){if(!X(t))return false;var e=typeof r;return("number"==e?R(t)&&B(r,t.length):"string"==e&&r in t)?(r=t[r],n===n?n===r:r!==r):false}function D(n){var r=typeof n;return"string"==r&&Un.test(n)||"number"==r?true:Dr(n)?false:!Fn.test(n)||false}function L(n){return typeof n=="number"&&-1<n&&0==n%1&&n<=Sr}function W(n){
-for(var r=tn(n),t=r.length,e=t&&n.length,u=o.support,u=e&&L(e)&&(Dr(n)||u.nonEnumStrings&&nn(n)||u.nonEnumArgs&&Q(n)),c=-1,a=[];++c<t;){var i=r[c];(u&&B(i,e)||rr.call(n,i))&&a.push(i)}return a}function V(n){if(o.support.unindexedChars&&nn(n)){for(var r=-1,t=n.length,e=Object(n);++r<t;)e[r]=n.charAt(r);return e}return X(n)?n:Object(n)}function Y(n){if(Dr(n))return n;var r=[];return t(n).replace($n,function(n,t,e,u){r.push(e?u.replace(Bn,"$1"):t||n)}),r}function q(r,t,e){var u=r?r.length:0;if(!u)return-1;
-
-if(typeof e=="number")e=0>e?jr(u+e,0):e;else if(e){if(e=0,u=r?r.length:e,typeof t!="number"||t!==t||u>Or){u=an,e=u(t);for(var o=0,c=r?r.length:0,a=e!==e,i=e===sn;o<c;){var f=cr((o+c)/2),l=u(r[f]),s=l===l;(a?s:i?s&&l!==sn:l<e)?o=f+1:c=f}e=wr(c,xr)}else{for(;e<u;){var o=e+u>>>1;r[o]<t?e=o+1:u=o}e=u}return r=r[e],(t===t?t===r:r!==r)?e:-1}return n(r,t,e||0)}function z(n){var r=n?n.length:0;return r?n[r-1]:sn}function G(n,r,t){var e=Dr(n)?l:v;return r=M(r,t),e(n,r)}function H(n,r,t,e){var u=n?Ur(n):0;
-return L(u)||(n=en(n),u=n.length),u?(t=typeof t!="number"||e&&C(r,t,e)?0:0>t?jr(u+t,0):t||0,typeof n=="string"||!Dr(n)&&nn(n)?t<u&&-1<n.indexOf(r,t):-1<F(n,r,t)):false}function J(n,r,t){var e=Dr(n)?s:d;return r=M(r,t),e(n,r)}function K(n,r){if(typeof n!="function")throw new TypeError(pn);return r=jr(r===sn?n.length-1:+r||0,0),function(){for(var t=arguments,e=-1,u=jr(t.length-r,0),o=Array(u);++e<u;)o[e]=t[r+e];switch(r){case 0:return n.call(this,o);case 1:return n.call(this,t[0],o);case 2:return n.call(this,t[0],t[1],o);
-
-}for(u=Array(r+1),e=-1;++e<r;)u[e]=t[e];return u[r]=o,n.apply(this,u)}}function Q(n){return u(n)&&R(n)&&tr.call(n)==hn}function X(n){var r=typeof n;return"function"==r||!!n&&"object"==r}function Z(n){return null==n?false:tr.call(n)==mn?er.test(nr.call(n)):u(n)&&(Jn(n)?er:Dn).test(n)}function nn(n){return typeof n=="string"||u(n)&&tr.call(n)==An}function rn(n){return u(n)&&L(n.length)&&!!Wn[tr.call(n)]}function tn(n){if(null==n)return[];X(n)||(n=Object(n));for(var r=n.length,t=o.support,r=r&&L(r)&&(Dr(n)||t.nonEnumStrings&&nn(n)||t.nonEnumArgs&&Q(n))&&r||0,e=n.constructor,u=-1,e=Lr(e)&&e.prototype||Xn,c=e===n,a=Array(r),i=0<r,f=t.enumErrorProps&&(n===Qn||n instanceof Error),l=t.enumPrototypes&&Lr(n);++u<r;)a[u]=u+"";
-
-for(var s in n)l&&"prototype"==s||f&&("message"==s||"name"==s)||i&&B(s,r)||"constructor"==s&&(c||!rr.call(n,s))||a.push(s);if(t.nonEnumShadows&&n!==Xn)for(r=n===Zn?An:n===Qn?bn:tr.call(n),t=kr[r]||kr[wn],r==wn&&(e=Xn),r=Ln.length;r--;)s=Ln[r],u=t[s],c&&u||(u?!rr.call(n,s):n[s]===e[s])||a.push(s);return a}function en(n){for(var r=Vr(n),t=-1,e=r.length,u=Array(e);++t<e;)u[t]=n[r[t]];return u}function un(n){return(n=t(n))&&Rn.test(n)?n.replace(Nn,"\\$&"):n}function on(n,r,t){return t&&C(n,r,t)&&(r=null),
-u(n)?fn(n):h(n,r)}function cn(n){return function(){return n}}function an(n){return n}function fn(n){return A(y(n,true))}function ln(n){return D(n)?O(n):E(n)}var sn,pn="Expected a function",hn="[object Arguments]",yn="[object Array]",gn="[object Boolean]",vn="[object Date]",bn="[object Error]",mn="[object Function]",jn="[object Number]",wn="[object Object]",dn="[object RegExp]",An="[object String]",xn="[object ArrayBuffer]",On="[object Float32Array]",En="[object Float64Array]",Sn="[object Int8Array]",Tn="[object Int16Array]",kn="[object Int32Array]",In="[object Uint8Array]",Pn="[object Uint8ClampedArray]",_n="[object Uint16Array]",Mn="[object Uint32Array]",Fn=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\n\\]|\\.)*?\1)\]/,Un=/^\w*$/,$n=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g,Nn=/[.*+?^${}()|[\]\/\\]/g,Rn=RegExp(Nn.source),Bn=/\\(\\)?/g,Cn=/\w*$/,Dn=/^\[object .+?Constructor\]$/,Ln="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),Wn={};
-
-Wn[On]=Wn[En]=Wn[Sn]=Wn[Tn]=Wn[kn]=Wn[In]=Wn[Pn]=Wn[_n]=Wn[Mn]=true,Wn[hn]=Wn[yn]=Wn[xn]=Wn[gn]=Wn[vn]=Wn[bn]=Wn[mn]=Wn["[object Map]"]=Wn[jn]=Wn[wn]=Wn[dn]=Wn["[object Set]"]=Wn[An]=Wn["[object WeakMap]"]=false;var Vn={};Vn[hn]=Vn[yn]=Vn[xn]=Vn[gn]=Vn[vn]=Vn[On]=Vn[En]=Vn[Sn]=Vn[Tn]=Vn[kn]=Vn[jn]=Vn[wn]=Vn[dn]=Vn[An]=Vn[In]=Vn[Pn]=Vn[_n]=Vn[Mn]=true,Vn[bn]=Vn[mn]=Vn["[object Map]"]=Vn["[object Set]"]=Vn["[object WeakMap]"]=false;var Yn={"function":true,object:true},qn=Yn[typeof module]&&module&&!module.nodeType&&module,zn=Yn[typeof self]&&self&&self.Object&&self,Gn=Yn[typeof window]&&window&&window.Object&&window,Hn=Yn[typeof exports]&&exports&&!exports.nodeType&&exports&&qn&&typeof global=="object"&&global&&global.Object&&global||Gn!==(this&&this.window)&&Gn||zn||this,Jn=function(){
-try{Object({toString:0}+"")}catch(n){return function(){return false}}return function(n){return typeof n.toString!="function"&&typeof(n+"")=="string"}}(),Kn=Array.prototype,Qn=Error.prototype,Xn=Object.prototype,Zn=String.prototype,nr=Function.prototype.toString,rr=Xn.hasOwnProperty,tr=Xn.toString,er=RegExp("^"+un(tr).replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),ur=Z(ur=Hn.ArrayBuffer)&&ur,or=Z(or=ur&&new ur(0).slice)&&or,cr=Math.floor,ar=Z(ar=Object.getOwnPropertySymbols)&&ar,ir=Kn.push,fr=Z(fr=Object.preventExtensions)&&fr,lr=Xn.propertyIsEnumerable,sr=Z(sr=Hn.Set)&&sr,pr=Kn.splice,hr=Z(hr=Hn.Uint8Array)&&hr,yr=function(){
-try{var n=Z(n=Hn.Float64Array)&&n,r=new n(new ur(10),0,1)&&n}catch(t){}return r}(),gr=function(){var n=fr&&Z(n=Object.assign)&&n;try{if(n){var r=fr({1:0});r[0]=1}}catch(t){try{n(r,"xo")}catch(e){}return!r[1]&&n}return false}(),vr=Z(vr=Array.isArray)&&vr,br=Z(br=Object.create)&&br,mr=Z(mr=Object.keys)&&mr,jr=Math.max,wr=Math.min,dr=Z(dr=Date.now)&&dr,Ar=Math.pow(2,32)-1,xr=Ar-1,Or=Ar>>>1,Er=yr?yr.BYTES_PER_ELEMENT:0,Sr=Math.pow(2,53)-1,Tr={};Tr[On]=Hn.Float32Array,Tr[En]=Hn.Float64Array,Tr[Sn]=Hn.Int8Array,
-Tr[Tn]=Hn.Int16Array,Tr[kn]=Hn.Int32Array,Tr[In]=Hn.Uint8Array,Tr[Pn]=Hn.Uint8ClampedArray,Tr[_n]=Hn.Uint16Array,Tr[Mn]=Hn.Uint32Array;var kr={};kr[yn]=kr[vn]=kr[jn]={constructor:true,toLocaleString:true,toString:true,valueOf:true},kr[gn]=kr[An]={constructor:true,toString:true,valueOf:true},kr[bn]=kr[mn]=kr[dn]={constructor:true,toString:true},kr[wn]={constructor:true},f(Ln,function(n){for(var r in kr)if(rr.call(kr,r)){var t=kr[r];t[n]=rr.call(t,n)}});var Ir=o.support={};!function(n){function r(){this.x=n}var t=arguments,e={
-0:n,length:n},u=[];r.prototype={valueOf:n,y:n};for(var o in new r)u.push(o);Ir.argsTag=tr.call(t)==hn,Ir.enumErrorProps=lr.call(Qn,"message")||lr.call(Qn,"name"),Ir.enumPrototypes=lr.call(r,"prototype"),Ir.funcDecomp=/\bthis\b/.test(function(){return this}),Ir.funcNames=typeof Function.name=="string",Ir.nonEnumStrings=!lr.call("x",0),Ir.nonEnumShadows=!/valueOf/.test(u),Ir.spliceObjects=(pr.call(e,0,1),!e[0]),Ir.unindexedChars="xx"!="x"[0]+Object("x")[0];try{Ir.nonEnumArgs=!lr.call(t,1)}catch(c){
-Ir.nonEnumArgs=true}}(1,0);var Pr=gr||function(n,r){return null==r?n:p(r,$r(r),p(r,Vr(r),n))},_r=function(n,r){return function(t,e){var u=t?Ur(t):0;if(!L(u))return n(t,e);for(var o=r?u:-1,c=V(t);(r?o--:++o<u)&&false!==e(c[o],o,c););return t}}(m),Mr=function(n){return function(r,t,e){var u=V(r);e=e(r);for(var o=e.length,c=n?o:-1;n?c--:++c<o;){var a=e[c];if(false===t(u[a],a,u))break}return r}}();or||(k=ur&&hr?function(n){var r=n.byteLength,t=yr?cr(r/Er):0,e=t*Er,u=new ur(r);if(t){var o=new yr(u,0,t);o.set(new yr(n,0,t));
-
-}return r!=e&&(o=new hr(u,e),o.set(new hr(n,e))),u}:cn(null));var Fr=br&&sr?function(n){return new c(n)}:cn(null),Ur=O("length"),$r=ar?function(n){return ar(V(n))}:cn([]),Nr=K(function(n,r){return R(n)?g(n,b(r,false,true)):[]}),Rr=K(function(n,r){return R(n)?g(n,r):[]}),Br=function(n,r){return function(t,e,u){return typeof e=="function"&&u===sn&&Dr(t)?n(t,e):r(t,T(e,u,3))}}(f,_r),Cr=dr||function(){return(new Date).getTime()};Ir.argsTag||(Q=function(n){return u(n)&&R(n)&&rr.call(n,"callee")&&!lr.call(n,"callee");
-
-});var Dr=vr||function(n){return u(n)&&L(n.length)&&tr.call(n)==yn},Lr=r(/x/)||hr&&!r(hr)?function(n){return tr.call(n)==mn}:r,Wr=function(n){return K(function(r,t){var e=-1,u=null==r?0:t.length,o=2<u&&t[u-2],c=2<u&&t[2],a=1<u&&t[u-1];for(typeof o=="function"?(o=T(o,a,5),u-=2):(o=typeof a=="function"?a:null,u-=o?1:0),c&&C(t[0],t[1],c)&&(o=3>u?null:o,u=1);++e<u;)(c=t[e])&&n(r,c,o);return r})}(function(n,r,t){if(t){var e=Vr(r);ir.apply(e,$r(r));for(var u=-1,o=e.length;++u<o;){var c=e[u],a=n[c],i=t(a,r[c],c,n,r);
-
-(i===i?i===a:a!==a)&&(a!==sn||c in n)||(n[c]=i)}}else n=Pr(n,r);return n}),Vr=mr?function(n){var r=null!=n&&n.constructor;return typeof r=="function"&&r.prototype===n||(typeof n=="function"?o.support.enumPrototypes:R(n))?W(n):X(n)?mr(n):[]}:W;c.prototype.push=function(n){var r=this.data;typeof n=="string"||X(n)?r.set.add(n):r.hash[n]=true},o.assign=Wr,o.callback=on,o.compact=function(n){for(var r=-1,t=n?n.length:0,e=-1,u=[];++r<t;){var o=n[r];o&&(u[++e]=o)}return u},o.constant=cn,o.debounce=function(n,r,t){
-function e(){var t=r-(Cr()-f);0>=t||t>r?(a&&clearTimeout(a),t=p,a=s=p=sn,t&&(h=Cr(),i=n.apply(l,c),s||a||(c=l=null))):s=setTimeout(e,t)}function u(){s&&clearTimeout(s),a=s=p=sn,(g||y!==r)&&(h=Cr(),i=n.apply(l,c),s||a||(c=l=null))}function o(){if(c=arguments,f=Cr(),l=this,p=g&&(s||!v),false===y)var t=v&&!s;else{a||v||(h=f);var o=y-(f-h),b=0>=o||o>y;b?(a&&(a=clearTimeout(a)),h=f,i=n.apply(l,c)):a||(a=setTimeout(u,o))}return b&&s?s=clearTimeout(s):s||r===y||(s=setTimeout(e,r)),t&&(b=true,i=n.apply(l,c)),
-!b||s||a||(c=l=null),i}var c,a,i,f,l,s,p,h=0,y=false,g=true;if(typeof n!="function")throw new TypeError(pn);if(r=0>r?0:+r||0,true===t)var v=true,g=false;else X(t)&&(v=t.leading,y="maxWait"in t&&jr(+t.maxWait||0,r),g="trailing"in t?t.trailing:g);return o.cancel=function(){s&&clearTimeout(s),a&&clearTimeout(a),a=s=p=sn},o},o.difference=Nr,o.filter=G,o.forEach=Br,o.intersection=function(){for(var r=[],t=-1,e=arguments.length,u=[],o=F(),c=o==n,i=[];++t<e;){var f=arguments[t];R(f)&&(r.push(f),u.push(c&&120<=f.length?Fr(t&&f):null));
-
-}if(e=r.length,2>e)return i;var c=r[0],l=-1,s=c?c.length:0,p=u[0];n:for(;++l<s;)if(f=c[l],0>(p?a(p,f):o(i,f,0))){for(t=e;--t;){var h=u[t];if(0>(h?a(h,f):o(r[t],f,0)))continue n}p&&p.push(f),i.push(f)}return i},o.keys=Vr,o.keysIn=tn,o.map=J,o.matches=fn,o.pluck=function(n,r){return J(n,ln(r))},o.property=ln,o.restParam=K,o.sortBy=function(n,r,t){if(null==n)return[];t&&C(n,r,t)&&(r=null);var u=-1;return r=M(r,t),n=d(n,function(n,t,e){return{a:r(n,t,e),b:++u,c:n}}),S(n,e)},o.values=en,o.without=Rr,o.collect=J,
-o.each=Br,o.extend=Wr,o.iteratee=on,o.select=G,o.escapeRegExp=un,o.identity=an,o.includes=H,o.indexOf=q,o.isArguments=Q,o.isArray=Dr,o.isFunction=Lr,o.isNative=Z,o.isNumber=function(n){return typeof n=="number"||u(n)&&tr.call(n)==jn},o.isObject=X,o.isString=nn,o.isTypedArray=rn,o.last=z,o.now=Cr,o.contains=H,o.include=H,o.VERSION="3.8.0",Hn._=o}).call(this);
\ No newline at end of file
diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json
index 277c5561..03cc3b2b 100644
--- a/src/_h5ai/conf/options.json
+++ b/src/_h5ai/conf/options.json
@@ -102,18 +102,20 @@ Options
     },
 
     /*
-    Allow filtering the displayed files and folders.
-    Will check entries for right order of characters, i.e.
-    "ab" matches "ab", "axb", "xaxbx" but not "ba".
-    Space separated sequences get OR-ed.
+    Allow filtering the displayed files and folders in current folder.
+    Checks for substrings.
 
-    Filters will be treated as JavaScript regular expressions
-    if you prefix them with "re:".
+    If advanced is enabled it checks entries for right order of characters,
+    i.e. "ab" matches "ab", "axb", "xaxbx" but not "ba". Space separated
+    sequences get OR-ed. Searches will be treated as JavaScript regular
+    expressions if you prefix them with "re:".
 
+    - advanced: boolean, use advanced pattern parsing
     - debounceTime: number, debounce wait time in milliseconds
     */
     "filter": {
         "enabled": true,
+        "advanced": true,
         "debounceTime": 100
     },
 
@@ -265,18 +267,20 @@ Options
     },
 
     /*
-    Allow searching files and folders.
-    Will check entries for right order of characters, i.e.
-    "ab" matches "ab", "axb", "xaxbx" but not "ba".
-    Space separated sequences get OR-ed.
+    Allow searching files and folders in and below current folder.
+    Checks for substrings.
 
-    Searches will be treated as JavaScript regular expressions
-    if you prefix them with "re:".
+    If advanced is enabled it checks entries for right order of characters,
+    i.e. "ab" matches "ab", "axb", "xaxbx" but not "ba". Space separated
+    sequences get OR-ed. Searches will be treated as JavaScript regular
+    expressions if you prefix them with "re:".
 
+    - advanced: boolean, use advanced pattern parsing
     - debounceTime: number, debounce wait time in milliseconds
     */
     "search": {
         "enabled": true,
+        "advanced": true,
         "debounceTime": 300
     },