Merge pull request #1531 from OpenBazaar/codeCleanup

cleaning up code

Author: jjeffryes

js/App.js

@@ -18,7 +18,7 @@ function App() {
   // TODO: rather than attach the serverConfigs CL
   // in main.js, pass in the instance here so the
   // dependency is more explicit.
-};
+}
 
 App.prototype.connectHeartbeatSocket = function() {
   var activeServer = this.serverConfigs.getActive();

js/router.js

@@ -55,13 +55,13 @@ module.exports = Backbone.Router.extend({
     history.back = function() {
         self.historyAction = 'back';
         return originalHistoryBack(arguments);
-    }
+    };
 
     var originalHistoryForward = history.forward;
     history.forward = function() {
         self.historyAction = 'forward';
         return originalHistoryForward(arguments);
-    }
+    };
 
     this.historySize = -1;
     this.historyPosition = -1;

js/start.js

@@ -459,7 +459,7 @@ launchOnboarding = function(guidCreating) {
         polyglot.t('serverConnectModal.connectingTo', { serverName: activeServer.get('name') })
     }
   });
-})()
+})();
 
 pageConnectModal.on('cancel', () => {
   removeStartupRetry();
@@ -565,7 +565,7 @@ app.getHeartbeatSocket().on('message', function(e) {
               $.getJSON(app.serverConfigs.getActive().getServerBaseUrl() + '/profile')
                   .done(function(profile, textStatus) {
                     if (textStatus == 'parsererror') {
-                      alert(window.polyglot.t('errorMessages.serverError'), window.polyglot.t('errorMessages.badJSON'));
+                      alert(window.polyglot.t('errorMessages.serverError') +"\n\n"+ window.polyglot.t('errorMessages.badJSON'));
                       app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
                         .open();
                       return;

js/utils/jquery.cropit.js

@@ -1156,4 +1156,3 @@ return /******/ (function(modules) { // webpackBootstrap
 /***/ }
 /******/ ])
 });
-;

js/utils/localize.js

@@ -20,4 +20,4 @@ function localizeShippingRegions(regions) {
 
 module.exports = {
   localizeShippingRegions: localizeShippingRegions
-}
+};

js/utils/messageModal.js

@@ -12,7 +12,6 @@ function showModal(errorTitle, errorMessage, titleClass, msgClass, onBtn1, onBtn
   if(typeof onBtn1 === "function"){
     if(!onBtn1Msg){
       throw new Error("button text for button 1 must be provided");
-      return;
     }
     $el.find('.js-messageModal-btnBar').removeClass('hide');
     $el.find('.js-messageModal-btn1').off().on('click', onBtn1).text(onBtn1Msg).addClass(onBtn1Class);
@@ -21,7 +20,6 @@ function showModal(errorTitle, errorMessage, titleClass, msgClass, onBtn1, onBtn
     if(typeof onBtn2 === "function"){
       if(!onBtn1Msg){
         throw new Error("button text for button 2 must be provided");
-        return;
       }
       $el.find('.js-messageModal-btn2').off().on('click', onBtn2).text(onBtn2Msg).addClass(onBtn2Class);
     } else {

js/views/buyWizardVw.js

@@ -531,7 +531,6 @@ module.exports = baseVw.extend({
 
     if(!data) {
       throw new Error('Data must be provided to the showPayAddress function');
-      return;
     }
 
     var totalBTCPrice = 0,

js/views/itemEditVw.js

@@ -97,8 +97,8 @@ module.exports = baseVw.extend({
 
       self.$photosModule = self.$('.js-photosModule');
 
-      this.sortableImages && this.sortableImages.destroy();
-      this.sortableImages = Sortable.create(self.$('.js-subImageWrap')[0], {
+      self.sortableImages && self.sortableImages.destroy();
+      self.sortableImages = Sortable.create(self.$('.js-subImageWrap')[0], {
         onUpdate: function(e) {
           var imagesArr = self.model.get('imageHashesToUpload');
 

js/views/pageNavServersVw.js

@@ -40,7 +40,7 @@ module.exports = BaseVw.extend({
         serverConfig = app.serverConfigs.get($target.data('server-config-id'));
 
     // launch page connect modal
-    this.pageConnectModal && this.pageConnectModal.remove()
+    this.pageConnectModal && this.pageConnectModal.remove();
     this.pageConnectModal = new PageConnectModal({
       className: 'server-connect top0',
       initialState: {

js/views/pageNavVw.js

@@ -351,25 +351,26 @@ module.exports = baseVw.extend({
   },
 
   aboutModalTabClick: function(e){
-    var tab = $(e.currentTarget).data('tab');
+    var tab = $(e.currentTarget).data('tab'),
+        $aboutSection = $('.modal-about-section');
     this.$aboutModal.find('.btn-tab').removeClass('active');
     $(e.currentTarget).addClass('active');
 
     switch(tab) {
       case "about":
-        $('.modal-about-section').addClass('hide');
+        $aboutSection.addClass('hide');
         $('.js-modalAboutMain').removeClass('hide');
         break;
       case "support":
-        $('.modal-about-section').addClass('hide');
+        $aboutSection.addClass('hide');
         $('.js-modalAboutSupport').removeClass('hide');
         break;
       case "contributors":
-        $('.modal-about-section').addClass('hide');
+        $aboutSection.addClass('hide');
         $('.js-modalAboutContributors').removeClass('hide');
         break;
       case "licensing":
-        $('.modal-about-section').addClass('hide');
+        $aboutSection.addClass('hide');
         $('.js-modalAboutLicensing').removeClass('hide');
         break;
     }