Fix some eslint warnings

.eslintignore

@@ -2,6 +2,7 @@ lib/alertify.js
 lib/dominate.js
 views/cache.js
 ts.js
+lib/sql_splitter.js
 
 public/**/*
 tests/**/*

.eslintrc.js

@@ -51,6 +51,7 @@ module.exports = {
       "hljs": true
     },
     "rules": {
+        "no-unused-vars": ["error", { "vars": "all", "args": "none", "ignoreRestSiblings": false }],
         "no-console": "off",
         "accessor-pairs": "error",
         "array-bracket-newline": "off",

app/login_components/login_postgres_url_form.js

@@ -1,3 +1,6 @@
+// @ts-ignore
+var url = require('url');
+
 class LoginPostgresUrlForm {
   /*::
     loginForm: LoginScreen

app/login_screen.js

@@ -1,6 +1,3 @@
-// @ts-ignore
-const url = require('url');
-
 class LoginScreen {
 
   /*::

app/models/index.js

@@ -80,7 +80,7 @@ class Index extends ModelBase {
   }
 
   columns () {
-    var str = this.pg_get_indexdef.match(/ON [^\(]+\((.+)\)/)[1];
+    var str = this.pg_get_indexdef.match(/ON [^(]+\((.+)\)/)[1];
     return str.split(/,\s+/).map(col => { return col.replace(/^"(.+)"$/, '$1'); });
   }
 }

app/top_menu.js

@@ -1,7 +1,5 @@
 var remote = require('electron').remote;
 var Menu = remote.Menu;
-var MenuItem = remote.MenuItem;
-var webFrame = require('electron').webFrame;
 
 var UpdatesController = require('./controllers/updates_controller');
 var ExportController = require('./controllers/export_controller');
@@ -224,7 +222,7 @@ if (process.platform == 'darwin') {
       {
         label: "Check For Updates...",
         click: () => {
-          (new global.UpdatesController).checkUpdates({showLoading: true, showAlreadyLatest: true});
+          (new UpdatesController).checkUpdates({showLoading: true, showAlreadyLatest: true});
         }
       },
       {

app/view_helpers.js

@@ -158,7 +158,7 @@ var helpers = global.ViewHelpers = {
   },
 
   icon: function(name, title, height = 20, width = 20) {
-    title = title === undefined ? name.replace(/[\-_]/g, ' ') : title;
+    title = title === undefined ? name.replace(/[-_]/g, ' ') : title;
     return `<img src="./public/icons/${name}.png" width="${width}" height="${height}" class="app-icon" title="${title}"/>`;
   },
 

app/views/dialogs/new_column.js

@@ -53,7 +53,7 @@ class NewColumn extends Dialog {
   }
 
   groupTypes (types) {
-    var types = types.slice(0);
+    types = types.slice(0);
     var grouped = {};
     var groupName;
 

app/views/dialogs/new_table.js

@@ -29,7 +29,7 @@ class NewTable extends Dialog {
 
   async onSubmit (data) {
     try {
-      var data = await this.handler.createTable(data);
+      data = await this.handler.createTable(data);
       this.defaultServerResponse(data);
     } catch (error) {
       this.defaultServerResponse(null, error);

app/views/panes/content.js

@@ -19,9 +19,9 @@ var filterMatchers = (() => {
     return type == 'integer';
   };
 
-  var isString = (type) => {
-    return type.match(/^character varying.*/);
-  };
+  //var isString = (type) => {
+  //  return type.match(/^character varying.*/);
+  //};
 
   var basicValidation = (type, v) => {
     if (v === '') return "Value is required";
@@ -490,7 +490,7 @@ class Content extends Pane {
   async viewForeign (schema, table, column, value) {
     var foreign = await this.handler.loadForeignRows(schema, table, column, value);
 
-    var dialog = new Dialog.RelatedRecords(this.handler, foreign, {
+    new Dialog.RelatedRecords(this.handler, foreign, {
       schema: schema,
       table: table,
       column: column,

app/views/panes/extensions.js

@@ -3,15 +3,18 @@ class Extensions extends Pane {
   renderTab (rows) {
     var scrollOffset = [0, 0];
     var selecredRow = null;
+
+    // save selected row and scroll possition
     if (this.content && this.handler.currentTab == 'extensions') {
-      var table = this.content.find('.rescol-content-wrapper')[0];
-      scrollOffset = table ? [table.scrollTop, table.scrollLeft] : [0, 0];
-      var selectedCells = $u(table).find('tr.selected td');
+      var oldTable = this.content.find('.rescol-content-wrapper')[0];
+      scrollOffset = oldTable ? [oldTable.scrollTop, oldTable.scrollLeft] : [0, 0];
+      var selectedCells = $u(oldTable).find('tr.selected td');
       selecredRow = selectedCells.length && selectedCells[0].innerHTML;
     }
 
     this.renderViewToPane('extensions', 'extensions_tab', {rows: rows});
 
+    // restore selected row and scroll position
     if (scrollOffset[0] != 0 && scrollOffset[1] != 0) {
       var table = this.content.find('.rescol-content-wrapper table');
       if (table[0]) {

app/views/panes/procedures.js

@@ -23,7 +23,7 @@ class Procedures extends Pane {
     }
   }
 
-  async editProc (poid, procName) {
+  async editProc (poid) {
     var proc = await Model.Procedure.find(poid);
 
     var dialog = new Dialog.EditProcedure(this.handler, proc, async (updated) => {
@@ -42,7 +42,7 @@ class Procedures extends Pane {
     return Model.Procedure.update(poid, newSource);
   }
 
-  async removeProc (poid, procName) {
+  async removeProc (poid) {
     var proc = await Model.Procedure.find(poid);
 
     if (await $u.confirm(`Delete procedure ${proc.name}(${proc.arg_list})?`)) {
@@ -53,7 +53,7 @@ class Procedures extends Pane {
     }
   }
 
-  async procDefinition (poid, name) {
+  async procDefinition (poid) {
     var proc = await Model.Procedure.find(poid);
     var data = await proc.getDefinition();
     new Dialog.DefProcedure(this.handler, proc, data.source);

app/views/panes/query.js

@@ -2,7 +2,7 @@ var csvGenerate = require('csv-stringify');
 
 class Query extends Pane {
 
-  renderTab (rows) {
+  renderTab () {
     if (this.content) return;
 
     this.renderViewToPane('query', 'query_tab');

build_package.js

@@ -1,5 +1,4 @@
-const builder = require("electron-builder")
-const Platform = builder.Platform
+const builder = require("electron-builder");
 
 var packageJson = require('./package.json');
 var childProcess = require('child_process');

index.js

@@ -75,6 +75,7 @@ global.$dom = function(tags) { return global.DOMinate(tags)[0]; };
 
 require('./app/utils');
 
+// eslint-disable-next-line
 function reloadCss() {
   var queryString = '?reload=' + new Date().getTime();
   global.$u('link[rel="stylesheet"]').each(function () {
@@ -97,19 +98,19 @@ electron.ipcRenderer.on('open-url', function(event, url) {
   });
 });
 
-$(window).on('window-ready', (event) => {
+$(window).on('window-ready', () => {
   electron.ipcRenderer.send('main-window-ready', {});
 });
 
 require('./app/top_menu');
 
-var arguments = electron.remote.process.argv;
-if (arguments.length > 2) {
-  var connectionStr = arguments[2];
+var cliArgs = electron.remote.process.argv;
+if (cliArgs.length > 2) {
+  var connectionStr = cliArgs[2];
   if (connectionStr.startsWith("postgres://")) {
     App.cliConnectString = connectionStr;
   } else {
-    window.alert(`Can't recognize argument ${arguments[2]}\nExpected postgres://user@server/dbname`);
+    window.alert(`Can't recognize argument ${cliArgs[2]}\nExpected postgres://user@server/dbname`);
   }
 }
 
@@ -147,7 +148,7 @@ $(document).ready(function() {
 
   setTimeout(function () {
     console.log("Checking updates info");
-    (new global.UpdatesController).checkUpdates();
+    (new UpdatesController).checkUpdates();
   }, 10000);
 
   /*

lib/cli_util.js

@@ -23,7 +23,7 @@ var CliUtil = {
   checkFiles(url, workingDir, callback) {
     var joinedPath = path.join(workingDir, url.replace('postgres://', ''));
     console.log("ckecking if exist", joinedPath);
-    fs.access(joinedPath, 'r', (err, fd) => {
+    fs.access(joinedPath, 'r', (err) => {
       if (err) {
         console.log(joinedPath, 'not exists');
         callback(url);
@@ -39,7 +39,7 @@ var CliUtil = {
   tryFindConfig(folder, callback) {
     var file = path.join(folder, '.postbird');
     console.log("ckecking if exist", file);
-    fs.access(file, 'r', (err, fd) => {
+    fs.access(file, 'r', (err) => {
       if (err) {
         callback(false);
       } else {
@@ -53,10 +53,10 @@ var CliUtil = {
       if (err) throw err;
       var fileData = data.toString().trim();
       if (fileData[0] == "{") {
-        var data = JSON.parse(fileData);
+        data = JSON.parse(fileData);
         callback(data.default);
       } else {
-        var data = require(path);
+        data = require(path);
         callback(data.default);
       }
     });

lib/error_reporter.js

@@ -102,7 +102,7 @@ var errorReporter = module.exports = function errorReporter(exception, showError
 
     if (process.platform == "darwin") {
       var exec = child_process.exec;
-      exec('sw_vers -productVersion', function (err, stdout, stderr) {
+      exec('sw_vers -productVersion', function (err, stdout) {
         extra.system = stdout;
         sender();
       });

lib/query_tab_resizer.js

@@ -38,7 +38,7 @@ class QueryTabResizer {
     });
   }
 
-  waitingForMouseUp (doc) {
+  waitingForMouseUp () {
     this.doc.one('mouseup touchend', (e) => {
       e.preventDefault();
       this.following = false;