servel 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a863f769dc401adeac14d38484a6e5ae7492d7f322e80a1fefd62bc4b7e5f286
-  data.tar.gz: c65d410dbf1ad9a645dcb9dc7d94e97c18d6a7a8badcc7f77a21959a4eb02112
+  metadata.gz: ba7bd2682174a0720a7bbdd976fe70a8c042236c37bb483fbd739e96a4b4a4e5
+  data.tar.gz: 60472441db9c31fc9b30b93a5cc6df9dd45d0849c58aa7f6a9017b8a386ff58b
 SHA512:
-  metadata.gz: a6b43b998bd6f67609370def7f37e4768083a8ec1df98e7ea5c00726b77f718c0a4211249966365315aed058b63d95aef2cc4b597885fb7b63aa655d8255c5e1
-  data.tar.gz: 51a0748759c661a13883a52018ba6819b9d800a1f42413ca469a22d41465c95e653f23b2ed96b606b1949d44ffb02279f714578cd27337985aa546bf0eb7892c
+  metadata.gz: 65d2782a424feb924fdd29aac0e510076b0ee9c6f5a524809290966d7d3572b7a5456a778ff4f1cc913999025b056b1866a4805c840193303d015035eba0a361
+  data.tar.gz: dd7275024f111053d55e66e22d266bea523e2656da47e43d59f9ce6021dda1433acb3bb160a4d25f6867211537c1b8291880f016a25b616882920a3eea97dd5d

data/app/index.haml

@@ -18,7 +18,6 @@
       #{include('css/gallery-text.css')}
 
     :javascript
-      #{include('js/natural-orderby.min.js')}
       #{include('js/entries.js')}
       #{include('js/common.js')}
       #{include('js/index.js')}

data/app/js/entries.js

@@ -23,10 +23,10 @@ var Entries = (function() {
     return filteredEntries;
   }
 
-  function sortByName(entries) {
-    return naturalOrderBy.orderBy(entries, function(entry) {
-      return entry.name.toLowerCase();
-    }, sortDirection);
+  var nameCollator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
+
+  function sortByName(a, b) {
+    return nameCollator.compare(a.name, b.name);
   }
 
   function sortByMtime(a, b) {
@@ -48,10 +48,9 @@ var Entries = (function() {
   }
 
   function runSort(entries) {
-    if(sortMethod == "name") return sortByName(entries);
-
     var sortFunction;
-    if(sortMethod == "mtime") sortFunction = sortByMtime;
+    if(sortMethod == "name") sortFunction = sortByName;
+    else if(sortMethod == "mtime") sortFunction = sortByMtime;
     else if(sortMethod == "size") sortFunction = sortBySize;
     else if(sortMethod == "type") sortFunction = sortByType;
 
@@ -62,9 +61,9 @@ var Entries = (function() {
   }
 
   function updateLists() {
-    specialEntries = window.specialEntries.slice();
-    directoryEntries = runSort(runFilter(window.directoryEntries.slice()));
-    fileEntries = runSort(runFilter(window.fileEntries.slice()));
+    var specialEntries = window.specialEntries.slice();
+    var directoryEntries = runSort(runFilter(window.directoryEntries.slice()));
+    var fileEntries = runSort(runFilter(window.fileEntries.slice()));
 
     all = [].concat(specialEntries, directoryEntries, fileEntries);
 

data/lib/servel/entry.rb

@@ -36,7 +36,7 @@ class Servel::Entry
       name: @name,
       type: @type,
       size: @size.to_i,
-      sizeText: @size.nil? ? "-" : @size,
+      sizeText: @size.nil? ? "-" : ActiveSupport::NumberHelper.number_to_human_size(@size),
       mtime: @mtime.to_i,
       mtimeText: @mtime.nil? ? "-" : @mtime.strftime("%e %b %Y %l:%M %p"),
       media: media?

data/lib/servel/haml_context.rb

@@ -1,6 +1,5 @@
 class Servel::HamlContext
   extend Servel::Instrumentation
-  include ActiveSupport::NumberHelper
 
   LOCK = Mutex.new
 

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.24.0"
+  VERSION = "0.25.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,6 @@ files:
 - app/js/gallery.js
 - app/js/index.js
 - app/js/listing.js
-- app/js/natural-orderby.min.js
 - app/js/ume.js
 - bin/console
 - bin/servel

data/app/js/natural-orderby.min.js

@@ -1,2 +0,0 @@
-var naturalOrderBy=function(e){"use strict";var d=function(e,n){return e<n?-1:n<e?1:0},r=/(^0x[\da-fA-F]+$|^([+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?(?!\.\d+)(?=\D|\s|$))|\d+)/g,l=/^\s+|\s+$/g,o=/\s+/g,u=/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/,t=/(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[/-]\d{1,4}[/-]\d{1,4}|^\w+, \w+ \d+, \d{4})/,a=/^0+[1-9]{1}[0-9]*$/,y=/[^\x00-\x80]/,m=function(e,n){return e.value===n.value?0:void 0!==e.parsedNumber&&void 0!==n.parsedNumber?d(e.parsedNumber,n.parsedNumber):e.chunks&&n.chunks?function(e,n){for(var r,t,i,o,u=e.length,a=n.length,s=Math.min(u,a),c=0;c<s;c++){var f=e[c],l=n[c];if(f!==l)return""===f!=(""===l)?""===f?-1:1:"number"==typeof f&&"number"==typeof l?d(f,l):"number"==typeof f||"number"==typeof l?"number"==typeof f?-1:1:y.test(f+l)&&f.localeCompare?(i=l,(o=f.localeCompare(i))?o/Math.abs(o):0):(r=f)<(t=l)?-1:t<r?1:0}return s<u||s<a?u<=s?-1:1:0}(e.chunks,n.chunks):(t=n,((r=e).chunks?!t.chunks:t.chunks)?r.chunks?-1:1:(r.isNaN?!t.isNaN:t.isNaN)?r.isNaN?-1:1:(r.isSymbol?!t.isSymbol:t.isSymbol)?r.isSymbol?-1:1:(r.isObject?!t.isObject:t.isObject)?r.isObject?-1:1:(r.isArray?!t.isArray:t.isArray)?r.isArray?-1:1:(r.isFunction?!t.isFunction:t.isFunction)?r.isFunction?-1:1:(r.isNull?!t.isNull:t.isNull)?r.isNull?-1:1:0);var r,t},v="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s=function(r){return"function"==typeof r?r:function(e){if(Array.isArray(e)){var n=Number(r);if(Number.isInteger(n))return e[n]}else if(e&&"object"===(void 0===e?"undefined":v(e))&&"function"!=typeof r)return e[r];return e}},c=function(e){if(0!==e.length){var n=Number(e);if(!Number.isNaN(n))return n}},b=function(e){var n=c(e);return void 0!==n?n:function(e){if(t.test(e)){var n=Date.parse(e);if(!Number.isNaN(n))return n}}(e)},p=function(e){var n;return(n=e,n.replace(r,"\0$1\0").replace(/\0$/,"").replace(/^\0/,"").split("\0")).map(function(e,n,r){return t=e,i=r.length,!u.test(t)||a.test(t)&&1!==i?t.replace(o," ").replace(l,""):c(t)||0;var t,i})},N=function(e){return Number.isNaN(e)||e instanceof Number&&Number.isNaN(e.valueOf())},f=function(){var f=!(0<arguments.length&&void 0!==arguments[0])||arguments[0];return function(e){if("string"==typeof e||e instanceof String||("number"==typeof e||e instanceof Number)&&!N(e)||"boolean"==typeof e||e instanceof Boolean||e instanceof Date){var n=(i=f,"boolean"==typeof(t=e)||t instanceof Boolean?Number(t).toString():"number"==typeof t||t instanceof Number?t.toString():t instanceof Date?t.getTime().toString():"string"==typeof t||t instanceof String?(i?t:t.toLowerCase()).replace(l,""):""),r=b(n);return{parsedNumber:r,chunks:p(r?""+r:n),value:e}}var t,i,o,u,a,s,c;return{isArray:Array.isArray(e),isFunction:(c=e,"function"==typeof c),isNaN:N(e),isNull:(s=e,null===s),isObject:(a=e,!(null===a||"object"!==(void 0===a?"undefined":v(a))||Array.isArray(a)||a instanceof Number||a instanceof String||a instanceof Boolean||a instanceof Date)),isSymbol:(u=e,"symbol"===(void 0===u?"undefined":v(u))),isUndefined:(o=e,void 0===o),value:e}}},g=function(t,e,r){var i=e.length?e.map(s):[function(e){return e}],n=t.map(function(n,e){return{index:e,values:i.map(function(e){return e(n)}).map(f())}});return n.sort(function(e,n){return function(e,n,r){for(var t=e.values,i=n.values,o=t.length,u=r.length,a=0;a<o;a++){var s=a<u?r[a]:null;if(s&&"function"==typeof s){var c=s(t[a].value,i[a].value);if(c)return c}else{var f=m(t[a],i[a]);if(f)return f*("desc"===s?-1:1)}}return 0}(e,n,r)}),n.map(function(e){return n=t,r=e.index,n[r];var n,r})};var i={caseSensitive:!0,order:"asc"};return e.orderBy=function(e,n,r){if(!e||!Array.isArray(e))return[];var t=function(e){if(!e)return[];var n=Array.isArray(e)?[].concat(e):[e];return n.some(function(e){return"string"!=typeof e&&"number"!=typeof e&&"function"!=typeof e})?[]:n}(n),i=function(e){if(!e)return[];var n=Array.isArray(e)?[].concat(e):[e];return n.some(function(e){return"asc"!==e&&"desc"!==e&&"function"!=typeof e})?[]:n}(r);return g(e,t,i)},e.compare=function(e){var n,o,r=(n=e)&&"object"===(void 0===n?"undefined":v(n))?{caseSensitive:"boolean"==typeof n.caseSensitive?n.caseSensitive:i.caseSensitive,order:"asc"===n.order||"desc"===n.order?n.order:i.order}:i;return o=r,function(e,n){var r=f(o.caseSensitive),t=r(e),i=r(n);return m(t,i)*("desc"===o.order?-1:1)}},e}({});
-//# sourceMappingURL=natural-orderby.min.js.map