summaryrefslogtreecommitdiffstats
path: root/deluge/ui/web
diff options
context:
space:
mode:
authorCalum Lind <calumlind@gmail.com>2018-10-16 10:02:03 +0100
committerCalum Lind <calumlind@gmail.com>2018-10-16 11:37:11 +0100
commitbb93a06fff924345e3c8543526fe525075cb4916 (patch)
treed1c1c2cf429a33d40dbcaa87fd1f15ed9415fd7d /deluge/ui/web
parent80178f7310986c0914f1e2abab2c4b56cab73912 (diff)
downloaddeluge-bb93a06fff924345e3c8543526fe525075cb4916.tar.gz
deluge-bb93a06fff924345e3c8543526fe525075cb4916.tar.bz2
deluge-bb93a06fff924345e3c8543526fe525075cb4916.zip
[WebUI] Fix prettier javascript issue
Prettier removed too many parentheses in asIPAdress and when minifying the plus unary combined with the plus operator to create an incorrect increment operator. So skip prettier formatting this secion of code. Also fix an ECMA5 warning from closure about function scope in FilesTab.
Diffstat (limited to 'deluge/ui/web')
-rw-r--r--deluge/ui/web/js/deluge-all/data/SortTypes.js3
-rw-r--r--deluge/ui/web/js/deluge-all/details/FilesTab.js8
2 files changed, 6 insertions, 5 deletions
diff --git a/deluge/ui/web/js/deluge-all/data/SortTypes.js b/deluge/ui/web/js/deluge-all/data/SortTypes.js
index df2daba65..e91299ec5 100644
--- a/deluge/ui/web/js/deluge-all/data/SortTypes.js
+++ b/deluge/ui/web/js/deluge-all/data/SortTypes.js
@@ -19,11 +19,12 @@ Ext.namespace('Deluge.data');
* @singleton
*/
Deluge.data.SortTypes = {
+ // prettier-ignore
asIPAddress: function(value) {
var d = value.match(
/(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\:(\d+)/
);
- return ((+d[1] * 256 + +d[2]) * 256 + +d[3]) * 256 + +d[4];
+ return ((+d[1] * 256 + (+d[2])) * 256 + (+d[3])) * 256 + (+d[4]);
},
asQueuePosition: function(value) {
diff --git a/deluge/ui/web/js/deluge-all/details/FilesTab.js b/deluge/ui/web/js/deluge-all/details/FilesTab.js
index 25a92cb0f..feebb5032 100644
--- a/deluge/ui/web/js/deluge-all/details/FilesTab.js
+++ b/deluge/ui/web/js/deluge-all/details/FilesTab.js
@@ -179,21 +179,21 @@ Deluge.details.FilesTab = Ext.extend(Ext.ux.tree.TreeGrid, {
break;
default:
var indexes = {};
- function walk(node) {
+ var walk = function(node) {
if (Ext.isEmpty(node.attributes.fileIndex)) return;
indexes[node.attributes.fileIndex] =
node.attributes.priority;
- }
+ };
this.getRootNode().cascade(walk);
var nodes = this.getSelectionModel().getSelectedNodes();
Ext.each(nodes, function(node) {
if (!node.isLeaf()) {
- function setPriorities(node) {
+ var setPriorities = function(node) {
if (Ext.isEmpty(node.attributes.fileIndex)) return;
indexes[node.attributes.fileIndex] =
baseItem.filePriority;
- }
+ };
node.cascade(setPriorities);
} else if (!Ext.isEmpty(node.attributes.fileIndex)) {
indexes[node.attributes.fileIndex] =