diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2017-10-14 16:21:46 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2017-10-14 16:21:46 -0400 |
| commit | d3f4a62c10b2634811e8202b9c653532ff86783b (patch) | |
| tree | 98634d6cbef3f6de7d0917a6d0ef454a739badfa | |
| parent | 7bd46d198407faa7e04a2b883309da7ef1c7d7a9 (diff) | |
| download | lighttpd-git-d3f4a62c10b2634811e8202b9c653532ff86783b.tar.gz | |
[mod_dirlisting] custom js date parse func (fixes #2823)
lighttpd mod_dirlisting produces a directory listing with the date in a
certain format, and lighttpd calls setlocale(LC_TIME, "C"), so strftime
date used in mod_dirlisting is predictable. Use a custom date parse
routine to replace Date.parse() in the javascript sorting functions.
x-ref:
"Directory listing / sort by last modified does not work on Safari"
https://redmine.lighttpd.net/issues/2823
| -rw-r--r-- | src/mod_dirlisting.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/mod_dirlisting.c b/src/mod_dirlisting.c index 382fa09a..597ec3b7 100644 --- a/src/mod_dirlisting.c +++ b/src/mod_dirlisting.c @@ -586,6 +586,27 @@ static const char js_simple_table_resort[] = \ " : (unit=='E') ? 1000000000000000000 : 1;\n" \ "}\n" \ "\n" \ +"var li_date_regex=/(\\d{4})-(\\w{3})-(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2})/;\n" \ +"\n" \ +"var li_mon = ['Jan','Feb','Mar','Apr','May','Jun',\n" \ +" 'Jul','Aug','Sep','Oct','Nov','Dec'];\n" \ +"\n" \ +"function li_mon_num(mon) {\n" \ +" var i; for (i = 0; i < 12 && mon != li_mon[i]; ++i); return i;\n" \ +"}\n" \ +"\n" \ +"function li_date_cmp(s1, s2) {\n" \ +" var dp1 = li_date_regex.exec(s1)\n" \ +" var dp2 = li_date_regex.exec(s2)\n" \ +" for (var i = 1; i < 7; ++i) {\n" \ +" var cmp = (2 != i)\n" \ +" ? parseInt(dp1[i]) - parseInt(dp2[i])\n" \ +" : li_mon_num(dp1[2]) - li_mon_num(dp2[2]);\n" \ +" if (0 != cmp) return cmp;\n" \ +" }\n" \ +" return 0;\n" \ +"}\n" \ +"\n" \ "function sortfn_then_by_name(a,b,sort_column) {\n" \ " if (sort_column == name_column || sort_column == type_column) {\n" \ " var ad = (a.cells[type_column].innerHTML === 'Directory');\n" \ @@ -602,11 +623,10 @@ static const char js_simple_table_resort[] = \ " if (a.cells[sort_column].className == 'int') {\n" \ " cmp = parseInt(at)-parseInt(bt);\n" \ " } else if (sort_column == date_column) {\n" \ -" cmp = Date.parse(at.replace(/-/g, '/'))\n" \ -" - Date.parse(bt.replace(/-/g, '/'));\n" \ " var ad = isdigit(at.substr(0,1));\n" \ " var bd = isdigit(bt.substr(0,1));\n" \ " if (ad != bd) return (!ad ? -1 : 1);\n" \ +" cmp = li_date_cmp(at,bt);\n" \ " } else if (sort_column == size_column) {\n" \ " var ai = parseInt(at, 10) * unit_multiplier(at.substr(-1,1));\n" \ " var bi = parseInt(bt, 10) * unit_multiplier(bt.substr(-1,1));\n" \ |