Merge remote-tracking branch 'refs/remotes/origin/master' into pr/1555

# Conflicts:
#	js/start.js
#	js/templates/appBar.html
#	js/views/settingsVw.js

Author: jjeffryes

.eslintrc

@@ -1,22 +1,108 @@
 {
   "root": true,
   "extends": "eslint:recommended",
-  "parser": "babel-eslint",
+  "parser": "esprima",
   "parserOptions": {
     "ecmaVersion": 6
   },
   "rules": {
-    "quotes": 0,
-    "curly": [1, "multi-line"],
+    "accessor-pairs": 1,
+    "array-callback-return": 2,
+    "block-scoped-var": 1,
+    "brace-style": 1,
+    "curly": [2, "multi-line"],
     "camelcase": 0,
     "comma-dangle": 0,
+    "comma-spacing": [2, { "before": false, "after": true }],
+    "comma-style": [2, "last"],
+    "consistent-this": [2, "self"],
+    "dot-location": [2, "property"],
     "dot-notation": 0,
+    "eqeqeq": 0,
+    "indent": [1, 2, { "VariableDeclarator": { "var": 2, "let": 2, "const": 3 } }],
+    "guard-for-in": 2,
+    "key-spacing": [1, {
+      "singleLine": {
+        "beforeColon": false,
+        "afterColon": true
+      },
+      "multiLine": {
+        "beforeColon": false,
+        "afterColon": true,
+        "mode": "minimum"
+      }}],
+    "keyword-spacing": 1,
+    "no-caller": 2,
+    "no-cond-assign": 2,
     "no-console": 0,
-    "no-use-before-define": [1, "nofunc"],
+    "no-control-regex": 2,
+    "no-debugger": 2,
+    "no-dupe-args": 2,
+    "no-dupe-keys": 2,
+    "no-duplicate-case": 2,
+    "no-else-return": 2,
+    "no-empty": 2,
+    "no-empty-character-class": 2,
+    "no-empty-function": 2,
+    "no-eq-null": 2,
+    "no-eval": 2,
+    "no-ex-assign": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-extra-boolean-cast": 2,
+    "no-extra-parens": [2, "all", {"nestedBinaryExpressions": false}],
+    "no-extra-semi": 2,
+    "no-fallthrough": 2,
+    "no-floating-decimal": 2,
+    "no-func-assign": 2,
+    "no-implicit-globals": 2,
+    "no-implied-eval": 2,
+    "no-invalid-regexp": 2,
+    "no-irregular-whitespace": 2,
+    "no-iterator": 2,
+    "no-label-var": 2,
+    "no-loop-func": 2,
+    "no-lone-blocks": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-multi-spaces": 1,
+    "no-multi-str": 2,
+    "no-multiple-empty-lines": [1, {"max": 2}],
+    "no-native-reassign": 2,
+    "no-negated-in-lhs": 2,
+    //"no-new": 2,
+    "no-new-func": 2,
+    "no-new-wrappers": 2,
+    "no-obj-calls": 2,
+    "no-octal": 2,
+    "no-octal-escape": 2,
+    "no-proto": 2,
+    "no-redeclare": 2,
+    "no-regex-spaces": 2,
+    "no-self-assign": 2,
+    "no-self-compare": 2,
+    "no-shadow-restricted-names": 2,
+    "no-undef": 2,
+    "no-undef-init": 2,
+    "no-undefined": 1,
     "no-underscore-dangle": 0,
-    "no-unused-vars": 0,
+    "no-unexpected-multiline": 2,
+    "no-unneeded-ternary": 2,
+    "no-unreachable": 2,
+    "no-unsafe-finally": 2,
+    "no-unused-labels": 2,
+    "no-unused-vars": [2, { "varsIgnorePattern": "cropit|chosen|mCustomScrollbar|mouseWheel|colpicker" }],
+    "no-use-before-define": [2, "nofunc"],
+    "no-useless-concat": 2,
+    "no-useless-escape": 2,
+    "no-with": 2,
     "new-cap": 0,
-    "semi": [1, "always"]
+    //"quotes": ["error", "single", {"avoidEscape": true, "allowTemplateLiterals": true}],
+    "semi": [1, "always"],
+    "strict": 2,
+    "use-isnan": 2,
+    "valid-jsdoc": 2,
+    "valid-typeof": 2,
+    "yoda": 2
   },
   "env": {
     "browser": true,

.jshintignore

@@ -0,0 +1 @@
+node_modules

.jshintrc

@@ -0,0 +1,10 @@
+{
+  "node": true,
+
+  "curly": true,
+  "latedef": true,
+  "quotmark": true,
+  "undef": true,
+  "unused": true,
+  "trailing": true
+}

js/App.js

@@ -1,5 +1,6 @@
+'use strict';
+
 var ipcRenderer = require('ipc-renderer'),
-    __ = require('underscore'),
     $ = require('jquery'),
     Socket = require('./utils/Socket'),
     _app;
@@ -10,7 +11,7 @@ function App() {
   // ensure we're a singleton
   if (_app) return _app;
 
-  _app = this;
+  _app = self;
   this._awayCounts = null;
   this._notifUnread = 0;
   this._chatMessagesUnread = 0;
@@ -77,7 +78,7 @@ App.prototype.getGuid = function(handle, resolver) {
     } else {
       deferred.reject();
     }
-  }).fail(function(jqXHR, status, errorThrown){
+  }).fail(function(){
     deferred.reject();
   });
 

js/collections/chatConversationsCl.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var Backbone = require('backbone'),
     app = require('../App.js').getApp(),
     ChatConversationMd = require('../models/chatConversationMd');
@@ -10,12 +12,12 @@ module.exports = Backbone.Collection.extend({
   model: ChatConversationMd,
 
   initialize: function() {
-      this.on('change:unread', function(model){
+    this.on('change:unread', function(model){
           // Only re-sort collection if unread count was incremented
-          if (model.hasChanged('unread') && model.get('unread') > 0) {
-            this.sort();
-          }
-      });
+      if (model.hasChanged('unread') && model.get('unread') > 0) {
+        this.sort();
+      }
+    });
   },
 
   comparator: function(a, b) {

js/collections/chatMessagesCl.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var Backbone = require('backbone'),
     app = require('../App.js').getApp(),
     ChatMessageMd = require('../models/chatMessageMd');
@@ -11,8 +13,5 @@ module.exports = Backbone.Collection.extend({
 
   comparator: function(msg) {
     return msg.get('timestamp');
-  },  
-
-  initialize: function(options) {
   }
 });

js/collections/chooseCountryCl.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var Backbone = require('backbone'),
     ChooseCountry = require('../models/chooseCountryMd');
 

js/collections/chooseCurrencyCl.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /* this reuses the country model */
 
 var Backbone = require('backbone'),

js/collections/chooseLanguageCl.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /* this reuses the country model */
 
 var Backbone = require('backbone'),

js/collections/discussionCl.js

@@ -1,12 +1,11 @@
+'use strict';
+
 var Backbone = require('backbone'),
     chatMessage = require('../models/chatMessageMd');
 
 
 module.exports = Backbone.Collection.extend({
 
-  model: chatMessage,
-
-  initialize: function(options) {
-  }
+  model: chatMessage
 
 });