Updates to the latest version of electron, along with changes to require statements to match the new API.

- deletes the unused jshint files
- clean up eslint warnings
- update eslint case indent and standardize indents in cases

Author: jjeffryes

.eslintrc

@@ -19,7 +19,7 @@
     "dot-location": [2, "property"],
     "dot-notation": 0,
     "eqeqeq": 0,
-    "indent": [1, 2, { "VariableDeclarator": { "var": 2, "let": 2, "const": 3 } }],
+    "indent": [1, 2, { "VariableDeclarator": { "var": 2, "let": 2, "const": 3 }, "SwitchCase": 1 }],
     "guard-for-in": 2,
     "key-spacing": [1, {
       "singleLine": {

.jshintignore

@@ -1,10 +1,11 @@
-'use strict'; 
+'use strict';
 
-var ipcRenderer = require('ipc-renderer'),
+var ipcRenderer = require('electron').ipcRenderer,
     $ = require('jquery'),
     Socket = require('./utils/Socket'),
     _app;
 
+
 function App() {
   var self = this;
 
@@ -54,7 +55,7 @@ App.prototype.login = function() {
       password: activeServer.get('password')
     },
     timeout: 3000
-  });  
+  });
 };
 
 App.prototype.getGuid = function(handle, resolver) {

.jshintrc

@@ -1,6 +1,6 @@
 'use strict';
 
-var ipcRenderer = require('ipc-renderer'),
+var ipcRenderer = require('electron').ipcRenderer,
     __ = require('underscore'),
     Backbone = require('backbone'),
     $ = require('jquery'),
@@ -284,10 +284,10 @@ module.exports = Backbone.Router.extend({
 
   launchPageConnectModal: function(config) {
     var defaults = {
-      connectText: 'Connecting...',
-      failedText: 'Unable to Connect.'
-    },
-    deferred = $.Deferred();
+          connectText: 'Connecting...',
+          failedText: 'Unable to Connect.'
+        },
+        deferred = $.Deferred();
 
     if (!(
         config &&

js/App.js

@@ -26,7 +26,7 @@ window.onblur = function() {
 };
 
 var Polyglot = require('node-polyglot'),
-    ipcRenderer = require('ipc-renderer'),
+    ipcRenderer = require('electron').ipcRenderer,
     remote = require('electron').remote,
     getBTPrice = require('./utils/getBitcoinPrice'),
     router = require('./router'),
@@ -208,7 +208,7 @@ app.serverConfigs.on('activeServerChange', () => {
 var platform = process.platform;
 
 if (platform === "linux") {
-  var scaleFactor = require('screen').getPrimaryDisplay().scaleFactor;
+  var scaleFactor = require('electron').screen.getPrimaryDisplay().scaleFactor;
   if (scaleFactor === 0) {
     scaleFactor = 1;
   }
@@ -259,8 +259,8 @@ $(document).on('mouseleave', 'a[data-href-tooltip]', function() {
 
 //record changes to the app state
 $(window).bind('hashchange', function(){
-   const host = encodeURIComponent(app.serverConfigs.getActive().getServerBaseUrl());
-   const route =  Backbone.history.getFragment();
+  const host = encodeURIComponent(app.serverConfigs.getActive().getServerBaseUrl());
+  const route = Backbone.history.getFragment();
   localStorage.setItem(host, route);
 });
 
@@ -298,49 +298,49 @@ $(window).bind('keydown', function(e) {
 
   if (ctrl) {
     switch (char) {
-    case window.config.keyShortcuts.undo:
-      e.preventDefault();
-        //run undo programmatically to avoid crash
-      document.execCommand('undo');
-      break;
-    case window.config.keyShortcuts.discover:
-      route = 'home';
-      break;
-    case window.config.keyShortcuts.myPage:
-      route = 'userPage';
-      break;
-    case window.config.keyShortcuts.customizePage:
-      route = 'userPage/' + user.get('guid') + '/customize';
-      break;
-    case window.config.keyShortcuts.create:
-      route = 'userPage/' + user.get('guid') + '/listingNew';
-      break;
-    case window.config.keyShortcuts.purchases:
-      route = 'transactions/purchases';
-      break;
-    case window.config.keyShortcuts.sales:
-      route = 'transactions/sales';
-      break;
-    case window.config.keyShortcuts.cases:
-      route = 'transactions/cases';
-      break;
-    case window.config.keyShortcuts.settings:
-      route = 'settings';
-      break;
-    case window.config.keyShortcuts.addressBar:
-        // Select all text in address bar
-      $('.js-navAddressBar').select();
-      break;
-    case window.config.keyShortcuts.save:
-      window.obEventBus.trigger('saveCurrentForm');
-      break;
-    case window.config.keyShortcuts.refresh:
-      e.preventDefault();
-      app.router.refresh();
-      break;
-    case window.config.keyShortcuts.restart:
-      location.reload();
-      break;
+      case window.config.keyShortcuts.undo:
+        e.preventDefault();
+          //run undo programmatically to avoid crash
+        document.execCommand('undo');
+        break;
+      case window.config.keyShortcuts.discover:
+        route = 'home';
+        break;
+      case window.config.keyShortcuts.myPage:
+        route = 'userPage';
+        break;
+      case window.config.keyShortcuts.customizePage:
+        route = 'userPage/' + user.get('guid') + '/customize';
+        break;
+      case window.config.keyShortcuts.create:
+        route = 'userPage/' + user.get('guid') + '/listingNew';
+        break;
+      case window.config.keyShortcuts.purchases:
+        route = 'transactions/purchases';
+        break;
+      case window.config.keyShortcuts.sales:
+        route = 'transactions/sales';
+        break;
+      case window.config.keyShortcuts.cases:
+        route = 'transactions/cases';
+        break;
+      case window.config.keyShortcuts.settings:
+        route = 'settings';
+        break;
+      case window.config.keyShortcuts.addressBar:
+          // Select all text in address bar
+        $('.js-navAddressBar').select();
+        break;
+      case window.config.keyShortcuts.save:
+        window.obEventBus.trigger('saveCurrentForm');
+        break;
+      case window.config.keyShortcuts.refresh:
+        e.preventDefault();
+        app.router.refresh();
+        break;
+      case window.config.keyShortcuts.restart:
+        location.reload();
+        break;
     }
 
     if (route !== null) {
@@ -408,7 +408,7 @@ var loadProfile = function(landingRoute, onboarded) {
             var userLang = model.get('language');
             cCode = model.get('currency_code');
 
-            if(userLang != window.polyglot.currentLocale){
+            if (userLang != window.polyglot.currentLocale){
               //when switching nodes, the language saved in localStorage can be different than the language in the
               // user model, but the user model does not trigger a change because it hasn't changed
               updatePolyglot(userLang);
@@ -643,64 +643,64 @@ removeStartupRetry = function() {
 app.getHeartbeatSocket().on('message', function(e) {
   if (e.jsonData && e.jsonData.status) {
     switch (e.jsonData.status) {
-    case 'generating GUID':
-      profileLoaded && location.reload();
-      if (guidCreating) return;
-
-        // todo: put in some timeout in the off chance the guid
-        // creation process doesn't complete after a long time.
-      guidCreating = $.Deferred();
-
-        // launch onboarding, pass in guid creating
-      launchOnboarding(guidCreating);
-      break;
-    case 'GUID generation complete':
-      profileLoaded && location.reload();
-
-      app.serverConfigs.getActive().save({
-        username: e.jsonData.username,
-        password: e.jsonData.password
-      });
-
-      app.login().done(function() {
-        guidCreating.resolve();
-      });
+      case 'generating GUID':
+        profileLoaded && location.reload();
+        if (guidCreating) return;
+
+          // todo: put in some timeout in the off chance the guid
+          // creation process doesn't complete after a long time.
+        guidCreating = $.Deferred();
+
+          // launch onboarding, pass in guid creating
+        launchOnboarding(guidCreating);
+        break;
+      case 'GUID generation complete':
+        profileLoaded && location.reload();
+
+        app.serverConfigs.getActive().save({
+          username: e.jsonData.username,
+          password: e.jsonData.password
+        });
 
-      break;
-    case 'online':
-      if (loadProfileNeeded && !guidCreating) {
-        loadProfileNeeded = false;
-        onboardingModal && onboardingModal.remove();
-
-        app.login().done(function(data) {
-          if (data.success) {
-            $.getJSON(app.serverConfigs.getActive().getServerBaseUrl() + '/profile')
-                  .done(function(profile, textStatus) {
-                    if (textStatus == 'parsererror') {
-                      alert(window.polyglot.t('errorMessages.serverError') +"\n\n"+ window.polyglot.t('errorMessages.badJSON'));
-                      app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
-                        .open();
-                      return;
-                    }
-
-                    if (__.isEmpty(profile)) {
-                      launchOnboarding(guidCreating = $.Deferred().resolve().promise());
-                    } else {
-                      app.serverConnectModal.succeedConnection(app.serverConfigs.getActive());
-                      loadProfile();
-                    }
-                  });
-          } else {
-            app.serverConnectModal.failConnection(
-                data.reason === 'too many attempts' ? 'failed-auth-too-many' : 'failed-auth',
-                app.serverConfigs.getActive()
-              ).open();
-          }
-        }).fail(function() {
-          app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
-              .open();
+        app.login().done(function() {
+          guidCreating.resolve();
         });
-      }
+
+        break;
+      case 'online':
+        if (loadProfileNeeded && !guidCreating) {
+          loadProfileNeeded = false;
+          onboardingModal && onboardingModal.remove();
+
+          app.login().done(function(data) {
+            if (data.success) {
+              $.getJSON(app.serverConfigs.getActive().getServerBaseUrl() + '/profile')
+                    .done(function(profile, textStatus) {
+                      if (textStatus == 'parsererror') {
+                        alert(window.polyglot.t('errorMessages.serverError') +"\n\n"+ window.polyglot.t('errorMessages.badJSON'));
+                        app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
+                          .open();
+                        return;
+                      }
+
+                      if (__.isEmpty(profile)) {
+                        launchOnboarding(guidCreating = $.Deferred().resolve().promise());
+                      } else {
+                        app.serverConnectModal.succeedConnection(app.serverConfigs.getActive());
+                        loadProfile();
+                      }
+                    });
+            } else {
+              app.serverConnectModal.failConnection(
+                  data.reason === 'too many attempts' ? 'failed-auth-too-many' : 'failed-auth',
+                  app.serverConfigs.getActive()
+                ).open();
+            }
+          }).fail(function() {
+            app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
+                .open();
+          });
+        }
     }
   }
   if (e.jsonData && e.jsonData.libbitcoin) {

js/router.js

@@ -4,7 +4,7 @@ var __ = require('underscore'),
     Backbone = require('backbone'),
     $ = require('jquery'),
     loadTemplate = require('../utils/loadTemplate'),
-    remote = require('remote'),
+    remote = require('electron').remote,
     userSettingsModel = require('../models/userMd'),
     userProfileModel = require('../models/userProfileMd');
 
@@ -26,7 +26,6 @@ module.exports = Backbone.View.extend({
   },
 
   initialize: function () {
-    this.avatarHash = "";
     this.serverUrl = this.model.get('serverUrl');
     this.userSettings = new userSettingsModel();
     this.userProfile = new userProfileModel();
@@ -226,4 +225,4 @@ module.exports = Backbone.View.extend({
     this.unbind();
     this.remove();
   }
-});
+});

js/start.js

@@ -11,7 +11,7 @@ var __ = require('underscore'),
     chosen = require('../utils/chosen.jquery.min.js'),
     qr = require('qr-encode'),
     app = require('../App').getApp(),
-    clipboard = require('clipboard'),
+    clipboard = require('electron').clipboard,
     templateHelpers = require('../utils/templateHelpers');
 
 module.exports = baseModal.extend({