Merge pull request #1809 from richardschneider/eslint

Fix eslint warnings

Author: jjeffryes

js/models/serverConfigMd.js

@@ -82,7 +82,9 @@ module.exports = Backbone.Model.extend({
       }
     }
 
-    return Object.keys(err).length && err || undefined;
+    if (Object.keys(err).length > 0) {
+      return err;
+    }
   },
 
   getServerBaseUrl: function() {

js/models/statusMessageMd.js

@@ -25,6 +25,8 @@ module.exports = window.Backbone.Model.extend({
       err['msg'] = 'Msg is required and must be a string.';
     }    
 
-    return Object.keys(err).length && err || undefined;
+    if (Object.keys(err).length > 0) {
+      return err;
+    }
   }
-});
+});

js/views/homeVw.js

@@ -17,8 +17,12 @@ module.exports = pageVw.extend({
   className: "homeView contentWrapper",
 
   events: {
-    'click .js-productsTab': function(){this.setState("products");},
-    'click .js-vendorsTab': function(){this.setState("vendors");},
+    'click .js-productsTab': function() {
+      this.setState("products");
+    },
+    'click .js-vendorsTab': function() {
+      this.setState("vendors");
+    },
     'click .js-homeCreateStore': 'createStore',
     'click .js-homeCreateListing': 'createListing',
     'click .js-homeSearchItemsClear': 'onSearchItemsClear',
@@ -203,11 +207,11 @@ module.exports = pageVw.extend({
         self.listingToggle = self.$('.js-homeListingToggle');
 
         self.setState(self.state, self.searchItemsText);
-        if(self.model.get('page').profile.vendor == true) {
+        if (self.model.get('page').profile.vendor == true) {
           self.$el.find('.js-homeCreateStore').addClass('hide');
           self.$el.find('.js-homeMyPage').addClass('show');
           self.$el.find('.js-homeCreateListing').addClass('show');
-        }else{
+        } else {
           self.$el.find('.js-homeCreateStore').addClass('show');
           self.$el.find('.js-homeCreateListing').addClass('hide');
         }
@@ -216,7 +220,7 @@ module.exports = pageVw.extend({
         self.loadingVendors = true;
         self.socketView.getVendors(self.socketUsersID);
         //set the filter
-        if(localStorage.getItem('homeShowAll') == "yes"){
+        if (localStorage.getItem('homeShowAll') == "yes"){
           self.setListingsAll();
           self.loadAllItems();
         } else {
@@ -246,7 +250,9 @@ module.exports = pageVw.extend({
   renderItem: function(item){
     var self = this,
         blocked,
-        addressCountries = this.userModel.get('shipping_addresses').map(function(address){ return address.country; }),
+        addressCountries = this.userModel.get('shipping_addresses').map(function(address) {
+          return address.country;
+        }),
         userCountry = this.userModel.get('country'),
         contract_type = item.contract_type;
 

js/views/itemEditVw.js

@@ -474,14 +474,36 @@ module.exports = baseVw.extend({
           canvas.height = imgW;
         }
         switch (orientation) {
-          case 2: ctx.translate(imgW, 0);      ctx.scale(-1, 1); break;
-          case 3: ctx.translate(imgW, imgH);   ctx.rotate(Math.PI); break;
-          case 4: ctx.translate(0, imgH);      ctx.scale(1, -1); break;
-          case 5: ctx.rotate(0.5 * Math.PI);   ctx.scale(1, -1); break;
-          case 6: ctx.rotate(0.5 * Math.PI);   ctx.translate(0, -imgH); break;
-          case 7: ctx.rotate(0.5 * Math.PI);   ctx.translate(imgW, -imgH); ctx.scale(-1, 1); break;
-          case 8: ctx.rotate(-0.5 * Math.PI);  ctx.translate(-imgW, 0); break;
-          default: // do nothing
+        case 2:
+          ctx.translate(imgW, 0);
+          ctx.scale(-1, 1);
+          break;
+        case 3:
+          ctx.translate(imgW, imgH);
+          ctx.rotate(Math.PI);
+          break;
+        case 4:
+          ctx.translate(0, imgH);
+          ctx.scale(1, -1);
+          break;
+        case 5:
+          ctx.rotate(0.5 * Math.PI);
+          ctx.scale(1, -1);
+          break;
+        case 6:
+          ctx.rotate(0.5 * Math.PI);
+          ctx.translate(0, -imgH);
+          break;
+        case 7:
+          ctx.rotate(0.5 * Math.PI);
+          ctx.translate(imgW, -imgH);
+          ctx.scale(-1, 1);
+          break;
+        case 8:
+          ctx.rotate(-0.5 * Math.PI);
+          ctx.translate(-imgW, 0);
+          break;
+        default: // do nothing
         }
         ctx.drawImage(newImage, 0, 0, imgW, imgH);
         dataURI = canvas.toDataURL('image/jpeg', 0.7);

js/views/pageNavVw.js

@@ -539,8 +539,7 @@ module.exports = baseVw.extend({
         $target.parents('.popMenu').length ||
         $target.is('[data-popmenu]') ||
         $target.parents('[data-popmenu]').length
-      ))
-    {
+      )) {
       if (!this.suggestionsVw.isVisible()) {
         app.hideOverlay();
       }

js/views/settingsVw.js

@@ -236,7 +236,7 @@ module.exports = pageVw.extend({
         placeholder_text_multiple: window.polyglot.t('chosenJS.placeHolderTextMultiple')
       });
 
-      self.avatarCropper =  self.$('#settings-image-cropper');
+      self.avatarCropper = self.$('#settings-image-cropper');
 
       self.avatarCropper.cropit({
         $preview: self.$('.js-settingsAvatarPreview'),
@@ -313,7 +313,7 @@ module.exports = pageVw.extend({
       editor.subscribe('blur', self.validateDescription);
 
       self.sortableAddresses && self.sortableAddresses.destroy();
-      if(self.$('.js-sortableAddresses').length) {
+      if (self.$('.js-sortableAddresses').length) {
         self.sortableAddresses = Sortable.create(self.$('.js-sortableAddresses')[0], {
           chosenClass: "addressBoxDragging",
           ghostClass: "addressBoxGhost"

js/views/suggestionsVw.js

@@ -88,8 +88,7 @@ module.exports = baseVw.extend({
 
         if (keyCode == 40) {
           this.itemMoveDown();
-        } 
-        else {
+        } else {
           this.itemMoveUp();
         }
       }
@@ -258,4 +257,4 @@ module.exports = baseVw.extend({
   remove: function() {
     baseVw.prototype.remove.apply(this, arguments);
   }
-});
+});

main.js

@@ -17,8 +17,8 @@ var fs = require('fs'),
 var launched_from_installer = false;
 var platform = os.platform();
 switch (platform) {
-  case "darwin":
-    platform = "mac";
+case "darwin":
+  platform = "mac";
 }
 var version = app.getVersion();
 var trayMenu = null;

valiquire-redirect.js

@@ -18,7 +18,9 @@ var electronModules = [
 
 module.exports = function redirect(request) {
   // Tell valiquire to ignore these modules
-  if(~electronModules.indexOf(request)) return null;
+  if (~electronModules.indexOf(request)) {
+    return null;
+  }
 
   // all others we don't redirect
   return request;