diff options
author | 2021-09-23 17:03:20 +1000 | |
---|---|---|
committer | 2021-09-23 17:03:20 +1000 | |
commit | d35ff4bca69175bb6909722379298c17ae2f0989 (patch) | |
tree | 8ad8ae2c0c4675f6a7e43126b48c00f53fb90459 /scripts/minimaws/lib | |
parent | 5c447ee7229c17b60c25b4513976068176d39590 (diff) |
-minimaws: Made table sort widgets (and the code behind them) less ugly.
-util/delegate.cpp: Added a couple of comments about assumptions.
Diffstat (limited to 'scripts/minimaws/lib')
-rw-r--r-- | scripts/minimaws/lib/assets/common.js | 109 | ||||
-rw-r--r-- | scripts/minimaws/lib/assets/sortasc.png | bin | 1157 -> 0 bytes | |||
-rw-r--r-- | scripts/minimaws/lib/assets/sortasc.svg | 4 | ||||
-rw-r--r-- | scripts/minimaws/lib/assets/sortdesc.png | bin | 1195 -> 0 bytes | |||
-rw-r--r-- | scripts/minimaws/lib/assets/sortdesc.svg | 4 | ||||
-rw-r--r-- | scripts/minimaws/lib/assets/sortind.png | bin | 1247 -> 0 bytes | |||
-rw-r--r-- | scripts/minimaws/lib/assets/sortind.svg | 5 | ||||
-rw-r--r-- | scripts/minimaws/lib/assets/style.css | 3 | ||||
-rw-r--r-- | scripts/minimaws/lib/wsgiserve.py | 9 |
9 files changed, 91 insertions, 43 deletions
diff --git a/scripts/minimaws/lib/assets/common.js b/scripts/minimaws/lib/assets/common.js index a9d1991e499..b7b482d5405 100644 --- a/scripts/minimaws/lib/assets/common.js +++ b/scripts/minimaws/lib/assets/common.js @@ -1,55 +1,82 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb -function sort_table(tbl, col, dir, numeric) +function make_table_sortable(tbl) { - var tbody = tbl.tBodies[0]; - var trows = Array.prototype.slice.call(tbody.rows, 0).sort( - function (x, y) + var sorticons = new Array(tbl.tHead.rows[0].cells.length); + + function TableSortHelper(i) + { + this.column = i; + this.header = tbl.tHead.rows[0].cells[i] + this.sorted = false; + this.direction = 1; + + this.icon = document.createElement('img'); + this.icon.setAttribute('src', assetsurl + '/sortind.svg'); + this.icon.addEventListener('click', this.icon_click.bind(this)); + + var container = document.createElement('div'); + container.setAttribute('class', 'sorticon'); + container.appendChild(this.icon); + this.header.appendChild(container); + } + + TableSortHelper.prototype = (function () { - if (numeric) - return dir * (parseFloat(x.cells[col].textContent) - parseFloat(y.cells[col].textContent)); - else - return dir * x.cells[col].textContent.localeCompare(y.cells[col].textContent); - }) - trows.forEach(function (row) { tbody.appendChild(row); }); -} + function set_unsorted(obj) + { + obj.sorted = false; + obj.icon.setAttribute('src', assetsurl + '/sortind.svg'); + } + function sort_table(obj) + { + var c = obj.header.cellIndex; + var numeric = obj.header.getAttribute('class') == 'numeric'; + var tbody = tbl.tBodies[0]; + var trows; + if (numeric) + { + trows = Array.prototype.slice.call(tbody.rows, 0).sort( + function (x, y) + { + return obj.direction * (parseFloat(x.cells[c].textContent) - parseFloat(y.cells[c].textContent)); + }); + } + else + { + trows = Array.prototype.slice.call(tbody.rows, 0).sort( + function (x, y) + { + return obj.direction * x.cells[c].textContent.localeCompare(y.cells[c].textContent); + }); + } + trows.forEach(function (row) { tbody.appendChild(row); }); + } -function make_table_sortable(tbl) -{ - var headers = tbl.tHead.rows[0].cells; - for (var i = 0; i < headers.length; i++) - { - (function (col) - { - var dir = 1; - var sorticon = document.createElement('img'); - sorticon.setAttribute('src', assetsurl + '/sortind.png'); - sorticon.style.cssFloat = 'right'; - sorticon.style.marginLeft = '0.5em'; - headers[col].appendChild(sorticon); - headers[col].addEventListener( - 'click', - function (event) + return { + icon_click : function (event) { - var imgsrc = sorticon.getAttribute('src'); - imgsrc = imgsrc.substr(imgsrc.lastIndexOf('/') + 1); - if (imgsrc != 'sortind.png') - dir = -dir; - if (dir < 0) - sorticon.setAttribute('src', assetsurl + '/sortdesc.png'); + if (this.sorted) + this.direction = -this.direction; + if (this.direction < 0) + this.icon.setAttribute('src', assetsurl + '/sortdesc.svg'); else - sorticon.setAttribute('src', assetsurl + '/sortasc.png'); - for (var i = 0; i < headers.length; i++) + this.icon.setAttribute('src', assetsurl + '/sortasc.svg'); + this.sorted = true; + for (var i = 0; i < sorticons.length; i++) { - if (i != col) - headers[i].lastChild.setAttribute('src', assetsurl + '/sortind.png'); + if (i != this.column) + set_unsorted(sorticons[i]); } - sort_table(tbl, col, dir, headers[col].getAttribute('class') == 'numeric'); - }); - }(i)); - } + sort_table(this); + } + }; + })(); + + for (var i = 0; i < sorticons.length; i++) + sorticons[i] = new TableSortHelper(i); } diff --git a/scripts/minimaws/lib/assets/sortasc.png b/scripts/minimaws/lib/assets/sortasc.png Binary files differdeleted file mode 100644 index 29b893cdd02..00000000000 --- a/scripts/minimaws/lib/assets/sortasc.png +++ /dev/null diff --git a/scripts/minimaws/lib/assets/sortasc.svg b/scripts/minimaws/lib/assets/sortasc.svg new file mode 100644 index 00000000000..c2ff41afccb --- /dev/null +++ b/scripts/minimaws/lib/assets/sortasc.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="30"> + <path d="m 14,16 h 16 l -8,-16 z" /> +</svg> diff --git a/scripts/minimaws/lib/assets/sortdesc.png b/scripts/minimaws/lib/assets/sortdesc.png Binary files differdeleted file mode 100644 index 63f48fc7213..00000000000 --- a/scripts/minimaws/lib/assets/sortdesc.png +++ /dev/null diff --git a/scripts/minimaws/lib/assets/sortdesc.svg b/scripts/minimaws/lib/assets/sortdesc.svg new file mode 100644 index 00000000000..4a10b3f6e47 --- /dev/null +++ b/scripts/minimaws/lib/assets/sortdesc.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="30"> + <path d="m 14,0 h 16 l -8,16 z" /> +</svg> diff --git a/scripts/minimaws/lib/assets/sortind.png b/scripts/minimaws/lib/assets/sortind.png Binary files differdeleted file mode 100644 index 773dd6aec02..00000000000 --- a/scripts/minimaws/lib/assets/sortind.png +++ /dev/null diff --git a/scripts/minimaws/lib/assets/sortind.svg b/scripts/minimaws/lib/assets/sortind.svg new file mode 100644 index 00000000000..6e351b6a6fb --- /dev/null +++ b/scripts/minimaws/lib/assets/sortind.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="16" width="30"> + <path d="m 0,16 h 16 l -8,-16 z" /> + <path d="m 14,0 h 16 l -8,16 z" /> +</svg> diff --git a/scripts/minimaws/lib/assets/style.css b/scripts/minimaws/lib/assets/style.css index 1e6ebd57ec0..8cbce4aaf0e 100644 --- a/scripts/minimaws/lib/assets/style.css +++ b/scripts/minimaws/lib/assets/style.css @@ -5,6 +5,9 @@ th { text-align: left; background-color: #ddd; padding: 0.25em } td { padding-left: 0.25em; padding-right: 0.25em } +div[class=sorticon] { float: right; height: 100%; margin-left: 0.5em } +div[class=sorticon] img { height: 0.7em; vertical-align: baseline } + table[class=sysinfo] th { text-align: right } div[class=dropzone] { padding: 0 1em; border-width: 2px; border-radius: 1em; border-style: dashed } diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py index 0a5cda4f762..26e7d523904 100644 --- a/scripts/minimaws/lib/wsgiserve.py +++ b/scripts/minimaws/lib/wsgiserve.py @@ -67,6 +67,8 @@ class ErrorPageHandler(HandlerBase): class AssetHandler(HandlerBase): + EXTENSIONMAP = { '.js': 'application/javascript', '.svg': 'image/svg+xml' } + def __init__(self, directory, app, application_uri, environ, start_response, **kwargs): super(AssetHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs) self.directory = directory @@ -90,8 +92,11 @@ class AssetHandler(HandlerBase): else: try: f = open(path, 'rb') - type, encoding = mimetypes.guess_type(path) - self.start_response('200 OK', [('Content-type', type or 'application/octet-stream'), ('Cache-Control', 'public, max-age=3600')]) + base, extension = os.path.splitext(path) + mimetype = self.EXTENSIONMAP.get(extension) + if mimetype is None: + mimetype, encoding = mimetypes.guess_type(path) + self.start_response('200 OK', [('Content-type', mimetype or 'application/octet-stream'), ('Cache-Control', 'public, max-age=3600')]) return wsgiref.util.FileWrapper(f) except: self.start_response('500 %s' % (self.STATUS_MESSAGE[500], ), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) |