Merge pull request #1648 from rmisio/tweaks

Tweaks

Author: jjeffryes

css/obBase.css

@@ -419,13 +419,6 @@ h6, .h6 {
   -webkit-app-region: no-drag;
 }
 
-#appBar .title {
-  /* since the loading spinners are centered in a manner
-     where chat is excluded from the width, we'll follow
-     suit here so our title is centered with the spinners */
-  width: calc(100% - 45px);
-}
-
 #pageNav .btn {
   -webkit-app-region: no-drag;
 }
@@ -4432,7 +4425,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   left: 0;
   top: 50%;
   margin-top: 117px;
-  margin-left: -40px;
   opacity: 1;
   transition: opacity 1s 5s ease;
   box-sizing: border-box;

js/collections/ratingCl.js

@@ -17,6 +17,6 @@ module.exports = Backbone.Collection.extend({
       return [];
     }
 
-    return response;
+    return response.reverse();
   }
 });

js/router.js

@@ -444,8 +444,6 @@ module.exports = Backbone.Router.extend({
   },
 
   settings: function(state){
-    $('.js-loadingModal').addClass('show');
-
     this.newView(settingsView, {
       viewArgs: {
         userModel: this.userModel,

js/views/homeVw.js

@@ -527,8 +527,9 @@ module.exports = pageVw.extend({
 
     //clear address bar
     window.obEventBus.trigger("setAddressBar", {'addressText': ""});
-    
+
     this.$el.find('.js-discoverHeading').html(window.polyglot.t('Discover'));
+    this.$el.find('.js-homeListingToggle').removeClass('hide');
 
     // change loading text copy
     this.$el.find('.js-loadingText').html(this.$el.find('.js-loadingText').data('defaultText'));

js/views/settingsVw.js

@@ -68,6 +68,8 @@ module.exports = pageVw.extend({
 
   initialize: function(options){
     var self = this;
+
+    $('.js-loadingModal').removeClass('hide');
     this.options = options || {};
     /* expected options:
      userModel
@@ -175,14 +177,18 @@ module.exports = pageVw.extend({
             getBTPrice("USD", function (btAve, currencyList) {
               self.availableCurrenciesList = currencyList;
               self.render();
-              $('.js-loadingModal').removeClass('show');
             });
           }
         });
       },
       error: function(model, response){
         console.log(response);
         messageModal.show(window.polyglot.t('errorMessages.getError'), window.polyglot.t('errorMessages.userError'));
+      },
+      complete: function() {
+        if (!self.isRemoved()) {
+          $('.js-loadingModal').addClass('hide');
+        }
       }
     });
   },