Deluge
diff options
| author | Calum Lind <calumlind+deluge@gmail.com> | 2021-12-14 22:28:43 +0000 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2021-12-15 09:37:55 +0000 |
| commit | a03e649da6b243986d7ca4ae467be6f17558d97a (patch) | |
| tree | dacbd7f1be99deb9133c81aa12d669e55523ebf2 /deluge/ui | |
| parent | 073bbbc09df1f3aa91610b70c05406611eac3975 (diff) | |
| download | deluge-a03e649da6b243986d7ca4ae467be6f17558d97a.tar.gz deluge-a03e649da6b243986d7ca4ae467be6f17558d97a.tar.bz2 deluge-a03e649da6b243986d7ca4ae467be6f17558d97a.zip | |
[Build] Fix WebUI js minifying error
Some users encoutered a bug where WebUI in browser show a white screen,
which indicates a problem with loading javascript files. The problem was
due to closure minifying failure leaving a zero-length deluge-all.js
file which broke the usual fallback mechanism to debug files.
* Fixed usage of ES6 const declaration breaking closure minifying.
* Cleanup minified files upon errors so no zero length files left
* Replaced broken and unmaintained slimit with rjsmin.
* Fixed unable to set dev or debug query args due to request args
requiring bytes.
Diffstat (limited to 'deluge/ui')
| -rw-r--r-- | deluge/ui/web/js/deluge-all/CopyMagnetWindow.js | 2 | ||||
| -rw-r--r-- | deluge/ui/web/server.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deluge/ui/web/js/deluge-all/CopyMagnetWindow.js b/deluge/ui/web/js/deluge-all/CopyMagnetWindow.js index 3e0cc9464..ddcd4abf9 100644 --- a/deluge/ui/web/js/deluge-all/CopyMagnetWindow.js +++ b/deluge/ui/web/js/deluge-all/CopyMagnetWindow.js @@ -51,7 +51,7 @@ Deluge.CopyMagnet = Ext.extend(Ext.Window, { }, show: function (a) { Deluge.CopyMagnet.superclass.show.call(this); - const torrent = deluge.torrents.getSelected(); + var torrent = deluge.torrents.getSelected(); deluge.client.core.get_magnet_uri(torrent.id, { success: this.onRequestComplete, scope: this, diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index f3866729e..ea2658071 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -592,13 +592,13 @@ class TopLevel(resource.Resource): uri_false = ('false', 'no', 'off', '0') debug_arg = None - req_dbg_arg = request.args.get('debug', [b''])[-1].decode().lower() + req_dbg_arg = request.args.get(b'debug', [b''])[-1].decode().lower() if req_dbg_arg in uri_true: debug_arg = True elif req_dbg_arg in uri_false: debug_arg = False - dev_arg = request.args.get('dev', [b''])[-1].decode().lower() in uri_true + dev_arg = request.args.get(b'dev', [b''])[-1].decode().lower() in uri_true dev_ver = 'dev' in common.get_version() script_type = 'normal' |