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

Commit ba9a5a2

Browse files
committed
- closes #1551
- fixes bug where blocked users were not removed from the settings/blocked screen when they were unblocked (due to overzealous es-lint fixing)
1 parent 479b4fb commit ba9a5a2

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

css/obBase.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4126,7 +4126,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
41264126
}
41274127
41284128
.tooltip:hover:after{
4129-
max-width: 400px;
41304129
background: rgba(37,37,37,.95);
41314130
border-radius: 3px;
41324131
bottom: -32px;

js/templates/itemEdit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ <h5><%= polyglot.t('Listing') %></h5>
111111
>
112112
</div>
113113
<div class="flexCol-4">
114-
<span class="fieldItem txt-placeholder"><%= polyglot.t('MinimumIs', { amount: ob.userCurrencyCode == "BTC" ? 0.0015 : (window.currentBitcoin * 0.002).toFixed(2) }) %> <span class="ion-help-circled fontSize12 tooltip" data-tooltip="<%= polyglot.t('MinimumPrice') %>"></span></span>
114+
<span class="fieldItem txt-placeholder"><%= polyglot.t('MinimumIs', { amount: ob.userCurrencyCode == "BTC" ? ob.intlNumFormat(0.0015) : ob.intlNumFormat(window.currentBitcoin * 0.002) }) %> <span class="ion-help-circled fontSize12 tooltip" data-tooltip="<%= polyglot.t('MinimumPrice') %>"></span></span>
115115
</div>
116116
</div>
117117
<div class="flexRow custCol-border js-shippingRow">

js/views/blockedUsersVw.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module.exports = baseVw.extend({
3232
this.listenTo(this.collection, 'remove', function(md) {
3333
var view;
3434

35-
if (view == __.find(this.subViews, function(subView) {
35+
if (view = __.find(this.subViews, function(subView) { // eslint-disable-line no-cond-assign
3636
return subView.model.get('guid') === md.get('guid');
3737
})) {
3838
self.removeSubView(view);

js/views/buyWizardVw.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ var __ = require('underscore'),
1313
chosen = require('../utils/chosen.jquery.min.js'),
1414
qr = require('qr-encode'),
1515
app = require('../App').getApp(),
16-
clipboard = require('clipboard');
16+
clipboard = require('clipboard'),
17+
templateHelpers = require('../utils/templateHelpers');
1718
Backbone.$ = $;
1819

1920
// randomize function
@@ -541,7 +542,7 @@ module.exports = baseVw.extend({
541542
this.$el.find('.js-buyWizardSpinner').addClass('hide');
542543
this.orderID = data.order_id;
543544
totalBTCPrice = data.amount;
544-
this.$el.find('.js-buyWizardDetailsTotalBTC').text(totalBTCPrice);
545+
this.$el.find('.js-buyWizardDetailsTotalBTC').text(templateHelpers.intlNumFormat(totalBTCPrice));
545546
this.payURL = data.payment_address;
546547

547548
payHREF = "bitcoin:"+ data.payment_address+"?amount="+totalBTCPrice;

0 commit comments

Comments
 (0)