From 9d4238e5cc11397b5c2aad4e150cf14afca39d58 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 22 Jan 2020 11:53:41 +0000
Subject: [PATCH] Re-enable jshint on editor and fixup issues

---
 Gruntfile.js                                  | 30 +++++++++----------
 .../editor-client/src/js/settings.js          |  3 +-
 .../src/js/ui/common/treeList.js              |  6 ++--
 .../@node-red/editor-client/src/js/ui/diff.js |  4 +--
 .../editor-client/src/js/ui/editors/json.js   | 10 +++----
 .../src/js/ui/editors/markdown.js             |  2 +-
 .../editor-client/src/js/ui/palette.js        | 14 +++------
 .../src/js/ui/projects/projects.js            |  3 +-
 .../@node-red/editor-client/src/js/ui/view.js |  8 ++---
 9 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 67739afe2..1e421f62d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -80,20 +80,20 @@ module.exports = function(grunt) {
                 //"loopfunc": true, // allow functions to be defined in loops
                 //"sub": true       // don't warn that foo['bar'] should be written as foo.bar
             },
-            all: [
-                'Gruntfile.js',
-                'red.js',
-                'packages/**/*.js'
-            ],
-            core: {
-                files: {
-                    src: [
-                        'Gruntfile.js',
-                        'red.js',
-                        'packages/**/*.js',
-                    ]
-                }
-            },
+            // all: [
+            //     'Gruntfile.js',
+            //     'red.js',
+            //     'packages/**/*.js'
+            // ],
+            // core: {
+            //     files: {
+            //         src: [
+            //             'Gruntfile.js',
+            //             'red.js',
+            //             'packages/**/*.js',
+            //         ]
+            //     }
+            // },
             nodes: {
                 files: {
                     src: [ 'nodes/core/*/*.js' ]
@@ -101,7 +101,7 @@ module.exports = function(grunt) {
             },
             editor: {
                 files: {
-                    src: [ 'editor/js/**/*.js' ]
+                    src: [ 'packages/node_modules/@node-red/editor-client/src/js/**/*.js' ]
                 }
             },
             tests: {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/settings.js b/packages/node_modules/@node-red/editor-client/src/js/settings.js
index e360cea7d..760165581 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/settings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/settings.js
@@ -56,8 +56,9 @@ RED.settings = (function () {
         if (key === "auth-tokens") {
             return JSON.parse(localStorage.getItem(key));
         } else {
+            var v;
             try {
-                var v = RED.utils.getMessageProperty(userSettings,key);
+                v = RED.utils.getMessageProperty(userSettings,key);
                 if (v === undefined) {
                     v = defaultIfUndefined;
                 }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
index 0e391a5b8..ed04733c9 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
@@ -410,7 +410,7 @@
                     return;
                 }
                 if (container.hasClass("expanded")) {
-                    done && done();
+                    if (done) { done() }
                     return;
                 }
                 if (!container.hasClass("built") && (item.deferBuild || typeof item.children === 'function')) {
@@ -435,7 +435,7 @@
                                 spinner.remove();
                             }
                         }
-                        done && done();
+                        if (done) { done() }
                         that._trigger("childrenloaded",null,item)
                     }
                     if (typeof item.children === 'function') {
@@ -457,7 +457,7 @@
                     } else {
                         item.treeList.childList.slideDown('fast');
                     }
-                    done && done();
+                    if (done) { done() }
                 }
                 container.addClass("expanded");
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
index 7c5b22f26..13a157e21 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -1029,9 +1029,9 @@ RED.diff = (function() {
         }
 
         var localSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-local"}).on("click", function(e) { e.stopPropagation();}).appendTo(localDiv);
-        var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId,class:className+"-local"}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
+        var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input "+className+"-local",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
         var remoteSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-remote"}).on("click", function(e) { e.stopPropagation();}).appendTo(remoteDiv);
-        var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId,class:className+"-remote"}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
+        var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input "+className+"-remote",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
         if (state === 'local') {
             localRadio.prop('checked',true);
         } else if (state === 'remote') {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index 9ebb82b0b..3b83e3089 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -327,10 +327,10 @@
                     item.value = valValue;
                     var valClass;
                     switch(valType) {
-                        case 'str':    item.children && (orphanedChildren = item.children); item.treeList.makeLeaf(true); item.type = "string";  valClass = "red-ui-debug-msg-type-string"; valValue = '"'+valValue+'"'; break;
-                        case 'num':    item.children && (orphanedChildren = item.children); item.treeList.makeLeaf(true); item.type = "number";  valClass = "red-ui-debug-msg-type-number"; break;
-                        case 'bool':   item.children && (orphanedChildren = item.children); item.treeList.makeLeaf(true); item.type = "boolean"; valClass = "red-ui-debug-msg-type-other";  item.value = (valValue === "true"); break;
-                        case 'null':   item.children && (orphanedChildren = item.children); item.treeList.makeLeaf(true); item.type = "null";    valClass = "red-ui-debug-msg-type-null"; item.value = valValue = "null"; break;
+                        case 'str':    if (item.children) { orphanedChildren = item.children } item.treeList.makeLeaf(true); item.type = "string";  valClass = "red-ui-debug-msg-type-string"; valValue = '"'+valValue+'"'; break;
+                        case 'num':    if (item.children) { orphanedChildren = item.children } item.treeList.makeLeaf(true); item.type = "number";  valClass = "red-ui-debug-msg-type-number"; break;
+                        case 'bool':   if (item.children) { orphanedChildren = item.children } item.treeList.makeLeaf(true); item.type = "boolean"; valClass = "red-ui-debug-msg-type-other";  item.value = (valValue === "true"); break;
+                        case 'null':   if (item.children) { orphanedChildren = item.children } item.treeList.makeLeaf(true); item.type = "null";    valClass = "red-ui-debug-msg-type-null"; item.value = valValue = "null"; break;
                         case 'object':
                             item.treeList.makeParent(orphanedChildren);
                             item.type = "object";
@@ -485,7 +485,7 @@
                             } else if (activeTab === "json-raw") {
                                 result = expressionEditor.getValue();
                             }
-                            onComplete && onComplete(result);
+                            if (onComplete) { onComplete(result) }
                             RED.tray.close();
                         }
                     }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
index 1363ba717..97957eadf 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -32,7 +32,7 @@
             '<button type="button" class="red-ui-button" data-style="bq"><i class="fa fa-quote-left"></i></button>'+
             '<button type="button" class="red-ui-button" data-style="hr"><i class="fa fa-minus"></i></button>'+
             '<button type="button" class="red-ui-button" data-style="link"><i class="fa fa-link"></i></button>'+
-        '</span>'
+        '</span>'+
     '</div>';
 
     var template = '<script type="text/x-red" data-template-name="_markdown">'+
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index d2ef971b3..9961cbf2b 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -212,16 +212,14 @@ RED.palette = (function() {
             }
 
             $('<div/>', {
-                class: "red-ui-palette-label"
-                     + (((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-label-right" : "")
+                class: "red-ui-palette-label"+(((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-label-right" : "")
             }).appendTo(d);
 
 
             if (def.icon) {
                 var icon_url = RED.utils.getNodeIcon(def);
                 var iconContainer = $('<div/>', {
-                    class: "red-ui-palette-icon-container"
-                         + (((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-icon-container-right" : "")
+                    class: "red-ui-palette-icon-container"+(((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-icon-container-right" : "")
                 }).appendTo(d);
                 RED.utils.createIconElement(icon_url, iconContainer, true);
             }
@@ -419,14 +417,10 @@ RED.palette = (function() {
             var portOutput = paletteNode.find(".red-ui-palette-port-output");
 
             var paletteLabel = paletteNode.find(".red-ui-palette-label");
-            paletteLabel.attr("class","red-ui-palette-label"
-                 + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-label-right" : "")
-             );
+            paletteLabel.attr("class","red-ui-palette-label" + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-label-right" : ""));
 
             var paletteIconContainer = paletteNode.find(".red-ui-palette-icon-container");
-            paletteIconContainer.attr("class","red-ui-palette-icon-container"
-                  + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-icon-container-right" : "")
-              );
+            paletteIconContainer.attr("class","red-ui-palette-icon-container" + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-icon-container-right" : ""));
 
             if (portInput.length === 0 && sf.in.length > 0) {
                 var portIn = document.createElement("div");
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
index dc48e558c..0c297c82a 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
@@ -1938,8 +1938,9 @@ RED.projects = (function() {
                 resultCallbackArgs = data;
             }
         }).fail(function(xhr,textStatus,err) {
+            var responses;
             if (options.responses && options.responses[xhr.status]) {
-                var responses = options.responses[xhr.status];
+                responses = options.responses[xhr.status];
                 if (typeof responses === 'function') {
                     resultCallback = responses;
                     resultCallbackArgs = {error:responses.statusText};
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 0967c630e..7a561d9cd 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -753,7 +753,7 @@ RED.view = (function() {
         //     .attr("d","M 0 "+(node_height/2)+" H "+(gridSize * -2))
         //     .attr("opacity",0);
 
-        var filter = undefined;
+        var filter;
         if (drag_lines.length > 0) {
             if (drag_lines[0].virtualLink) {
                 filter = {type:drag_lines[0].node.type === 'link in'?'link out':'link in'}
@@ -1495,6 +1495,7 @@ RED.view = (function() {
     var lastSelection = null;
     function updateSelection() {
         var selection = {};
+        var activeWorkspace = RED.workspaces.active();
 
         var workspaceSelection = RED.workspaces.selection();
         if (workspaceSelection.length === 0) {
@@ -1504,7 +1505,6 @@ RED.view = (function() {
             if (selected_link != null) {
                 selection.link = selected_link;
             }
-            var activeWorkspace = RED.workspaces.active();
             activeLinks = RED.nodes.filterLinks({
                 source:{z:activeWorkspace},
                 target:{z:activeWorkspace}
@@ -1622,7 +1622,7 @@ RED.view = (function() {
         var workspaceSelection = RED.workspaces.selection();
         if (workspaceSelection.length > 0) {
             var workspaceCount = 0;
-            workspaceSelection.forEach(function(ws) { if (ws.type === 'tab') workspaceCount++ });
+            workspaceSelection.forEach(function(ws) { if (ws.type === 'tab') { workspaceCount++ } });
             if (workspaceCount === RED.workspaces.count()) {
                 // Cannot delete all workspaces
                 return;
@@ -1663,7 +1663,7 @@ RED.view = (function() {
             var removedLinks = [];
             var removedSubflowOutputs = [];
             var removedSubflowInputs = [];
-            var removedSubflowStatus = undefined;
+            var removedSubflowStatus;
             var subflowInstances = [];
 
             var startDirty = RED.nodes.dirty();