From bb93a06fff924345e3c8543526fe525075cb4916 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind@gmail.com>
Date: Tue, 16 Oct 2018 10:02:03 +0100
Subject: [PATCH] [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.
---
 deluge/ui/web/js/deluge-all/data/SortTypes.js   | 3 ++-
 deluge/ui/web/js/deluge-all/details/FilesTab.js | 8 ++++----
 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] =