From 691cbce10faeffb6572772aea64862cb1c9c87a7 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 23 Jul 2016 02:36:16 +0200
Subject: [PATCH] Replace regularCmp with cmp.

---
 src/_h5ai/public/js/lib/ext/sort.js  | 4 ++--
 src/_h5ai/public/js/lib/ext/tree.js  | 4 ++--
 src/_h5ai/public/js/lib/util/dom.js  | 3 +--
 src/_h5ai/public/js/lib/util/lo.js   | 1 +
 src/_h5ai/public/js/lib/util/misc.js | 3 ---
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/_h5ai/public/js/lib/ext/sort.js b/src/_h5ai/public/js/lib/ext/sort.js
index 62c3393e..f710a13b 100644
--- a/src/_h5ai/public/js/lib/ext/sort.js
+++ b/src/_h5ai/public/js/lib/ext/sort.js
@@ -1,4 +1,4 @@
-const {each, toArray, dom, regularCmp, naturalCmp} = require('../util');
+const {each, toArray, dom, cmp, naturalCmp} = require('../util');
 const event = require('../core/event');
 const resource = require('../core/resource');
 const allsettings = require('../core/settings');
@@ -43,7 +43,7 @@ const cmpFn = (prop, reverse, ignorecase, natural) => {
             }
         }
 
-        res = natural ? naturalCmp(val1, val2) : regularCmp(val1, val2);
+        res = natural ? naturalCmp(val1, val2) : cmp(val1, val2);
         return reverse ? -res : res;
     };
 };
diff --git a/src/_h5ai/public/js/lib/ext/tree.js b/src/_h5ai/public/js/lib/ext/tree.js
index a8944777..3f17fe84 100644
--- a/src/_h5ai/public/js/lib/ext/tree.js
+++ b/src/_h5ai/public/js/lib/ext/tree.js
@@ -1,4 +1,4 @@
-const {each, dom, regularCmp, naturalCmp} = require('../util');
+const {each, dom, cmp, naturalCmp} = require('../util');
 const event = require('../core/event');
 const location = require('../core/location');
 const resource = require('../core/resource');
@@ -66,7 +66,7 @@ const cmpItems = (item1, item2) => {
         val2 = val2.toLowerCase();
     }
 
-    return settings.naturalSort ? naturalCmp(val1, val2) : regularCmp(val1, val2);
+    return settings.naturalSort ? naturalCmp(val1, val2) : cmp(val1, val2);
 };
 
 const update = item => {
diff --git a/src/_h5ai/public/js/lib/util/dom.js b/src/_h5ai/public/js/lib/util/dom.js
index 37fdd0b3..088b7350 100644
--- a/src/_h5ai/public/js/lib/util/dom.js
+++ b/src/_h5ai/public/js/lib/util/dom.js
@@ -48,9 +48,8 @@ const isElDocWin = x => isElement(x) || isDocument(x) || isWindow(x);
 const addListener = (el, type, fn) => el.addEventListener(type, fn);
 const removeListener = (el, type, fn) => el.removeEventListener(type, fn);
 
-const reReady = /^(i|c|loade)/;
 const onReady = fn => {
-    if (reReady.test(doc.readyState)) {
+    if (/^(i|c|loade)/.test(doc.readyState)) {
         fn();
     } else {
         addListener(doc, 'DOMContentLoaded', fn);
diff --git a/src/_h5ai/public/js/lib/util/lo.js b/src/_h5ai/public/js/lib/util/lo.js
index a3100f48..641d7194 100644
--- a/src/_h5ai/public/js/lib/util/lo.js
+++ b/src/_h5ai/public/js/lib/util/lo.js
@@ -62,6 +62,7 @@ module.exports = {
     toArray,
     difference,
     intersection,
+    cmp,
     sortBy,
     debounce
 };
diff --git a/src/_h5ai/public/js/lib/util/misc.js b/src/_h5ai/public/js/lib/util/misc.js
index 08c9dd54..26fadf9a 100644
--- a/src/_h5ai/public/js/lib/util/misc.js
+++ b/src/_h5ai/public/js/lib/util/misc.js
@@ -1,5 +1,3 @@
-const regularCmp = (x, y) => x < y ? -1 : x > y ? 1 : 0;
-
 const escapePattern = sequence => {
     return sequence.replace(/[\-\[\]{}()*+?.,\\$\^|#\s]/g, '\\$&');
 };
@@ -19,6 +17,5 @@ const parsePattern = (sequence, advanced) => {
 };
 
 module.exports = {
-    regularCmp,
     parsePattern
 };