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

Commit 0491326

Browse files
jjeffryesjjeffryes
committed
more es-lint fixes
1 parent 85634a6 commit 0491326

File tree

12 files changed

+42
-41
lines changed

12 files changed

+42
-41
lines changed

‎js/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// App specific configuration
2-
var testnet = localStorage.getItem('testnet') == 'true' ? true : false, //change to false to use main net
2+
var testnet = localStorage.getItem('testnet') == 'true',
33
bitcoinValidationRegexMainnet = "^[13][a-km-zA-HJ-NP-Z1-9]{25,34}$",
44
bitcoinValidationRegexTestnet = "^[2mn][a-km-zA-HJ-NP-Z1-9]{25,34}$",
55
bitcoinValidationRegex = testnet ? bitcoinValidationRegexTestnet : bitcoinValidationRegexMainnet;

‎js/templates/guidStillCreatingModal.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="modal-hero-icon"></div>
33
<p class="h6 homeModal-heroText fancy-heading"><%= polyglot.t('Welcome') %></p>
44
</div>
5-
<div class="accordion-window" style="left: 0px;">
5+
<div class="accordion-window" style="left: 0;">
66
<div class="accordion-child accordion-active custCol-primary overflowHidden" style="width: 525px; height: 374px;">
77
<div class="bar barTxt h6 custCol-secondary custCol-text">
88
<i class="ion-android-sync spinner"></i>

‎js/views/buyAddressesVw.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = Backbone.View.extend({
3131
__.extend({}, self.model.toJSON(), {
3232
worldwide: self.worldwide,
3333
selected: selected,
34-
shipsToList: localize.localizeShippingRegions(self.shippingRegions),
34+
shipsToList: localize.localizeShippingRegions(self.shippingRegions)
3535
})
3636
)
3737
);

‎js/views/buyWizardVw.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ module.exports = baseVw.extend({
206206
}
207207

208208
//set the QR details checkbox
209-
var QRtoggleVal = localStorage.getItem('AdditionalPaymentData') != "false" ? true : false;
209+
var QRtoggleVal = localStorage.getItem('AdditionalPaymentData') != "false";
210210
self.$('#BuyWizardQRDetailsInput').prop('checked', QRtoggleVal);
211211
});
212212
return this;

‎js/views/chatVw.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ module.exports = baseVw.extend({
335335
handleSocketMessage: function(response) {
336336
var msg = JSON.parse(response.data).message,
337337
openlyChatting = false,
338-
conversationMd;
338+
conversationMd,
339+
avatar;
339340

340341
if (!msg) return;
341342

@@ -418,7 +419,7 @@ module.exports = baseVw.extend({
418419
if (document.hasFocus() && chatHead && chatHead.get('unread')) {
419420
$.post(app.serverConfigs.getActive().getServerBaseUrl() + '/mark_chat_message_as_read', {guid: guid});
420421
chatHead.set('unread', 0);
421-
this.setAggregateUnreadCount()
422+
this.setAggregateUnreadCount();
422423
}
423424
},
424425

‎js/views/onboardingModal.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

33
var Backbone = require('backbone'),
4+
__ = require('underscore'),
45
loadTemplate = require('../utils/loadTemplate'),
56
moment = require('moment'),
67
cropit = require('../utils/jquery.cropit'),
@@ -438,10 +439,7 @@ module.exports = baseModal.extend({
438439
if (failed + succeeded === followers.length) {
439440
failed ? deferred.reject() : deferred.resolve();
440441
}
441-
442-
console.log(jqXHR);
443-
console.log(status);
444-
console.log(errorThrown);
442+
445443
}).done(function(data) {
446444
if (data.success) {
447445
succeeded++;
@@ -489,7 +487,7 @@ module.exports = baseModal.extend({
489487
var img_hash = data.image_hashes[0];
490488

491489
if(data.success === true && img_hash !== 'b472a266d0bd89c13706a4132ccfb16f7c3b9fcb' && img_hash.length == 40) {
492-
deferred.resolve(img_hash)
490+
deferred.resolve(img_hash);
493491
} else {
494492
deferred.reject();
495493
}
@@ -551,7 +549,7 @@ module.exports = baseModal.extend({
551549
});
552550
};
553551

554-
reader.readAsDataURL(file)
552+
reader.readAsDataURL(file);
555553
};
556554

557555
xhr.onerror = function (e) {
@@ -582,11 +580,12 @@ module.exports = baseModal.extend({
582580
baseModal.prototype.render.apply(self, arguments);
583581

584582
// pre-select timezone
585-
var timeZoneOffset = new Date().getTimezoneOffset();
586-
timeZoneOffset = parseInt(Math.abs(timeZoneOffset/60));
587-
timeZoneOffset = moment().isDST() ? timeZoneOffset + 1 : timeZoneOffset;
588-
timeZoneOffset = '(GMT ' + (timeZoneOffset < 0 ? '+' : '-') + timeZoneOffset + ':00)';
589-
var selectedTimeZone = self.$("[id*='" + timeZoneOffset + "']");
583+
var timeZoneOffset1 = new Date().getTimezoneOffset(),
584+
timeZoneOffset2 = parseInt(Math.abs(timeZoneOffset1/60)),
585+
timeZoneOffset3 = moment().isDST() ? timeZoneOffset2 + 1 : timeZoneOffset2,
586+
timeZoneOffset4 = '(GMT ' + (timeZoneOffset3 < 0 ? '+' : '-') + timeZoneOffset3 + ':00)',
587+
selectedTimeZone = self.$("[id*='" + timeZoneOffset4 + "']");
588+
590589
selectedTimeZone.prop('checked', true);
591590
self.model.set('time_zone', selectedTimeZone.val());
592591

‎js/views/serverConnectModal.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ var __ = require('underscore'),
1111
ServerConnectHeaderVw = require('./serverConnectHeaderVw'),
1212
ServerConfigFormVw = require('./serverConfigFormVw'),
1313
ServerConfigsVw = require('./serverConfigsVw');
14+
import * as $ from "jquery";
1415

1516
module.exports = BaseModal.extend({
1617
className: 'server-connect-modal modal-fullscreen',

‎js/views/settingsVw.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,8 @@ module.exports = Backbone.View.extend({
396396
notifications = user.notifications,
397397
moderatorStatus = this.model.get('page').profile.moderator,
398398
vendorStatus = this.model.get('page').profile.vendor,
399-
fancyStatus = window.localStorage.getItem('notFancy');
400-
401-
smtp_notifications = (user.smtp_notifications == 1) ? true : false;
399+
fancyStatus = window.localStorage.getItem('notFancy'),
400+
smtp_notifications = (user.smtp_notifications == 1) ? true : false;
402401

403402
this.$('#pageForm input[name=nsfw]').val([String(pageNSFW)]);
404403
this.$("#generalForm input[name=nsfw][value=" + localStorage.getItem('NSFWFilter') + "]").prop('checked', true);
@@ -424,8 +423,8 @@ module.exports = Backbone.View.extend({
424423
currencyList.unshift({code: "BTC", currency:"Bitcoin", currencyUnits: "4"});
425424

426425
__.each(countryList, function(c, i){
427-
var country_option = $('<option value="'+c.dataName+'" data-name="'+c.name+'">'+polyglot.t(`countries.${c.dataName}`)+'</option>');
428-
var ship_country_option = $('<option value="'+c.dataName+'" data-name="'+c.name+'">'+polyglot.t(`countries.${c.dataName}`)+'</option>');
426+
var country_option = $('<option value="'+c.dataName+'" data-name="'+c.name+'">'+window.polyglot.t(`countries.${c.dataName}`)+'</option>');
427+
var ship_country_option = $('<option value="'+c.dataName+'" data-name="'+c.name+'">'+window.polyglot.t(`countries.${c.dataName}`)+'</option>');
429428
country_option.attr("selected",user.country == c.dataName);
430429
//if user has a country in their profile, preselect it in the new address section
431430
ship_country_option.attr("selected",user.country== c.dataName);
@@ -1017,8 +1016,8 @@ module.exports = Backbone.View.extend({
10171016
);
10181017
}
10191018
$('#testSMTPButton').removeClass('loading');
1020-
})
1021-
})
1019+
});
1020+
});
10221021
},
10231022

10241023
saveAdvanced: function(){

‎js/views/transactionModalVw.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ module.exports = baseVw.extend({
100100
this.model = new orderModel({
101101
cCode: this.cCode,
102102
btAve: this.btAve,
103-
avatar_hash: this.avatar_hash,
103+
avatar_hash: this.avatar_hash
104104
//serverUrl: this.serverUrl,
105105
//transactionType: this.transactionType,
106106
//avatarURL: this.avatarURL,
@@ -183,7 +183,7 @@ module.exports = baseVw.extend({
183183
self.discussionScroller = self.$('.js-discussionScroller');
184184
self.moderatorPercentage = self.model.get('displayModerator').feeDecimal;
185185
//set the QR details checkbox
186-
var QRtoggleVal = localStorage.getItem('AdditionalPaymentData') != "false" ? true : false;
186+
var QRtoggleVal = localStorage.getItem('AdditionalPaymentData') != "false";
187187
self.$('#BuyWizardQRDetailsInput').prop('checked', QRtoggleVal);
188188
});
189189
},
@@ -553,7 +553,7 @@ module.exports = baseVw.extend({
553553
messageText = messageInput.val(),
554554
self = this,
555555
socketMessageId = Math.random().toString(36).slice(2),
556-
avatar_hash = this.avatar_hash
556+
avatar_hash = this.avatar_hash;
557557

558558
__.each(messages, function(msg){
559559
if (messageText) {

‎js/views/userPageVw.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ module.exports = baseVw.extend({
683683
self.fetchFollowers();
684684
//mark whether page is following you
685685
if(self.options.ownPage === false && Boolean(__.findWhere(followingArray, {guid: self.userID}))){
686-
self.$('.js-followsMe').removeClass('hide')
686+
self.$('.js-followsMe').removeClass('hide');
687687
}
688688
//mark whether page is being followed
689689
if(self.options.ownPage === false){
@@ -773,7 +773,7 @@ module.exports = baseVw.extend({
773773
var self = this,
774774
select = this.$el.find('.js-categories'),
775775
selectOptions = [],
776-
addressCountries = self.options.userModel.get('shipping_addresses').map(function(address){ return address.country }),
776+
addressCountries = self.options.userModel.get('shipping_addresses').map(function(address){ return address.country; }),
777777
userCountry = self.options.userModel.get('country');
778778

779779
addressCountries.push(userCountry);
@@ -1546,7 +1546,7 @@ module.exports = baseVw.extend({
15461546
if($targ.hasClass('confirm')){
15471547
$targ.addClass('loading').removeClass('confirm');
15481548
this.unfollowUser({'guid': this.pageID}).fail(() => {
1549-
$(e.target).removeClass('loading')
1549+
$(e.target).removeClass('loading');
15501550
});
15511551
} else {
15521552
$targ.addClass('confirm');

0 commit comments

Comments
 (0)