Skip to content
This repository has been archived by the owner on May 16, 2019. It is now read-only.

Tweaks #1648

Merged
merged 3 commits into from
Jun 3, 2016
Merged

Tweaks #1648

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions css/obBase.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -4434,7 +4427,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;
Expand Down
2 changes: 1 addition & 1 deletion js/collections/ratingCl.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ module.exports = Backbone.Collection.extend({
return [];
}

return response;
return response.reverse();
}
});
2 changes: 0 additions & 2 deletions js/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,6 @@ module.exports = Backbone.Router.extend({
},

settings: function(state){
$('.js-loadingModal').addClass('show');

this.newView(settingsView, {
viewArgs: {
userModel: this.userModel,
Expand Down
3 changes: 2 additions & 1 deletion js/views/homeVw.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
8 changes: 7 additions & 1 deletion js/views/settingsVw.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ module.exports = pageVw.extend({

initialize: function(options){
var self = this;

$('.js-loadingModal').removeClass('hide');
this.options = options || {};
/* expected options:
userModel
Expand Down Expand Up @@ -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');
}
}
});
},
Expand Down