From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Wed, 11 Jul 2018 08:13:40 +0000 (+0300)
Subject: [WebUI] Do not redeclare variables
X-Git-Tag: 1.7.8~5^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=99cf8eafc4f6cae6e6187dfa929da756536dbeb8;p=rspamd.git

[WebUI] Do not redeclare variables
---

diff --git a/.eslintrc.json b/.eslintrc.json
index ee10918bb..7e3d6f05d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -76,7 +76,6 @@
         "no-loop-func": "off",
         "no-negated-condition": "off",
         "no-param-reassign": "off",
-        "no-redeclare": "off",
         "no-shadow": "off",
         "no-underscore-dangle": "off",
         "no-use-before-define": "off",
diff --git a/interface/js/app/config.js b/interface/js/app/config.js
index a64e8f3ab..160061694 100644
--- a/interface/js/app/config.js
+++ b/interface/js/app/config.js
@@ -77,10 +77,11 @@ define(["jquery"],
                     $tbody = $("<tbody>");
 
                     $.each(data, function (i, item) {
+                        var label;
                         if ((item.editable === false || rspamd.read_only)) {
-                            var label = "<span class=\"label label-default\">Read</span>";
+                            label = "<span class=\"label label-default\">Read</span>";
                         } else {
-                            var label = "<span class=\"label label-default\">Read</span>&nbsp;<span class=\"label label-success\">Write</span>";
+                            label = "<span class=\"label label-default\">Read</span>&nbsp;<span class=\"label label-success\">Write</span>";
                         }
                         var $tr = $("<tr>");
                         $("<td class=\"col-md-2 maps-cell\">" + label + "</td>").appendTo($tr);
diff --git a/interface/js/app/history.js b/interface/js/app/history.js
index 573a21407..b264df67a 100644
--- a/interface/js/app/history.js
+++ b/interface/js/app/history.js
@@ -158,15 +158,16 @@ define(["jquery", "footable", "humanize"],
 
                     preprocess_item(item);
                     Object.keys(item.symbols).map(function (key) {
+                        var str;
                         var sym = item.symbols[key];
 
                         if (sym.description) {
-                            var str = "<strong><abbr data-sym-key=\"" + key + "\">" + sym.name + "</abbr></strong>(" + sym.score + ")";
+                            str = "<strong><abbr data-sym-key=\"" + key + "\">" + sym.name + "</abbr></strong>(" + sym.score + ")";
 
                             // Store description for tooltip
                             symbolDescriptions[key] = sym.description;
                         } else {
-                            var str = "<strong>" + sym.name + "</strong>(" + sym.score + ")";
+                            str = "<strong>" + sym.name + "</strong>(" + sym.score + ")";
                         }
 
                         if (sym.options) {