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

Commit b654f82

Browse files
chore(eslint): fix most of the eslint warnings
1 parent 386f375 commit b654f82

File tree

9 files changed

+88
-60
lines changed

9 files changed

+88
-60
lines changed

js/router.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,10 @@ module.exports = Backbone.Router.extend({
284284

285285
launchPageConnectModal: function(config) {
286286
var defaults = {
287-
connectText: 'Connecting...',
288-
failedText: 'Unable to Connect.'
289-
},
290-
deferred = $.Deferred();
287+
connectText: 'Connecting...',
288+
failedText: 'Unable to Connect.'
289+
},
290+
deferred = $.Deferred();
291291

292292
if (!(
293293
config &&

js/views/homeVw.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ module.exports = pageVw.extend({
1717
className: "homeView contentWrapper",
1818

1919
events: {
20-
'click .js-productsTab': function(){this.setState("products");},
21-
'click .js-vendorsTab': function(){this.setState("vendors");},
20+
'click .js-productsTab': function() {
21+
this.setState("products");
22+
},
23+
'click .js-vendorsTab': function() {
24+
this.setState("vendors");
25+
},
2226
'click .js-homeCreateStore': 'createStore',
2327
'click .js-homeCreateListing': 'createListing',
2428
'click .js-homeSearchItemsClear': 'onSearchItemsClear',
@@ -203,11 +207,11 @@ module.exports = pageVw.extend({
203207
self.listingToggle = self.$('.js-homeListingToggle');
204208

205209
self.setState(self.state, self.searchItemsText);
206-
if(self.model.get('page').profile.vendor == true) {
210+
if (self.model.get('page').profile.vendor == true) {
207211
self.$el.find('.js-homeCreateStore').addClass('hide');
208212
self.$el.find('.js-homeMyPage').addClass('show');
209213
self.$el.find('.js-homeCreateListing').addClass('show');
210-
}else{
214+
} else {
211215
self.$el.find('.js-homeCreateStore').addClass('show');
212216
self.$el.find('.js-homeCreateListing').addClass('hide');
213217
}
@@ -216,7 +220,7 @@ module.exports = pageVw.extend({
216220
self.loadingVendors = true;
217221
self.socketView.getVendors(self.socketUsersID);
218222
//set the filter
219-
if(localStorage.getItem('homeShowAll') == "yes"){
223+
if (localStorage.getItem('homeShowAll') == "yes"){
220224
self.setListingsAll();
221225
self.loadAllItems();
222226
} else {
@@ -246,7 +250,9 @@ module.exports = pageVw.extend({
246250
renderItem: function(item){
247251
var self = this,
248252
blocked,
249-
addressCountries = this.userModel.get('shipping_addresses').map(function(address){ return address.country; }),
253+
addressCountries = this.userModel.get('shipping_addresses').map(function(address) {
254+
return address.country;
255+
}),
250256
userCountry = this.userModel.get('country'),
251257
contract_type = item.contract_type;
252258

js/views/itemEditVw.js

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -474,14 +474,36 @@ module.exports = baseVw.extend({
474474
canvas.height = imgW;
475475
}
476476
switch (orientation) {
477-
case 2: ctx.translate(imgW, 0); ctx.scale(-1, 1); break;
478-
case 3: ctx.translate(imgW, imgH); ctx.rotate(Math.PI); break;
479-
case 4: ctx.translate(0, imgH); ctx.scale(1, -1); break;
480-
case 5: ctx.rotate(0.5 * Math.PI); ctx.scale(1, -1); break;
481-
case 6: ctx.rotate(0.5 * Math.PI); ctx.translate(0, -imgH); break;
482-
case 7: ctx.rotate(0.5 * Math.PI); ctx.translate(imgW, -imgH); ctx.scale(-1, 1); break;
483-
case 8: ctx.rotate(-0.5 * Math.PI); ctx.translate(-imgW, 0); break;
484-
default: // do nothing
477+
case 2:
478+
ctx.translate(imgW, 0);
479+
ctx.scale(-1, 1);
480+
break;
481+
case 3:
482+
ctx.translate(imgW, imgH);
483+
ctx.rotate(Math.PI);
484+
break;
485+
case 4:
486+
ctx.translate(0, imgH);
487+
ctx.scale(1, -1);
488+
break;
489+
case 5:
490+
ctx.rotate(0.5 * Math.PI);
491+
ctx.scale(1, -1);
492+
break;
493+
case 6:
494+
ctx.rotate(0.5 * Math.PI);
495+
ctx.translate(0, -imgH);
496+
break;
497+
case 7:
498+
ctx.rotate(0.5 * Math.PI);
499+
ctx.translate(imgW, -imgH);
500+
ctx.scale(-1, 1);
501+
break;
502+
case 8:
503+
ctx.rotate(-0.5 * Math.PI);
504+
ctx.translate(-imgW, 0);
505+
break;
506+
default: // do nothing
485507
}
486508
ctx.drawImage(newImage, 0, 0, imgW, imgH);
487509
dataURI = canvas.toDataURL('image/jpeg', 0.7);

js/views/pageNavVw.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,7 @@ module.exports = baseVw.extend({
540540
$target.parents('.popMenu').length ||
541541
$target.is('[data-popmenu]') ||
542542
$target.parents('[data-popmenu]').length
543-
))
544-
{
543+
)) {
545544
if (!this.suggestionsVw.isVisible()) {
546545
app.hideOverlay();
547546
}

js/views/settingsVw.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ module.exports = pageVw.extend({
236236
placeholder_text_multiple: window.polyglot.t('chosenJS.placeHolderTextMultiple')
237237
});
238238

239-
self.avatarCropper = self.$('#settings-image-cropper');
239+
self.avatarCropper = self.$('#settings-image-cropper');
240240

241241
self.avatarCropper.cropit({
242242
$preview: self.$('.js-settingsAvatarPreview'),
@@ -313,7 +313,7 @@ module.exports = pageVw.extend({
313313
editor.subscribe('blur', self.validateDescription);
314314

315315
self.sortableAddresses && self.sortableAddresses.destroy();
316-
if(self.$('.js-sortableAddresses').length) {
316+
if (self.$('.js-sortableAddresses').length) {
317317
self.sortableAddresses = Sortable.create(self.$('.js-sortableAddresses')[0], {
318318
chosenClass: "addressBoxDragging",
319319
ghostClass: "addressBoxGhost"

js/views/suggestionsVw.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ module.exports = baseVw.extend({
8888

8989
if (keyCode == 40) {
9090
this.itemMoveDown();
91-
}
92-
else {
91+
} else {
9392
this.itemMoveUp();
9493
}
9594
}
@@ -258,4 +257,4 @@ module.exports = baseVw.extend({
258257
remove: function() {
259258
baseVw.prototype.remove.apply(this, arguments);
260259
}
261-
});
260+
});

js/views/transactionModalVw.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ module.exports = baseModal.extend({
679679

680680
if (this.discussionInput.val()) {
681681
saveToAPI(this.discussionForm, '', this.serverUrl + "dispute_contract", function () {
682-
self.status = 4;
682+
self.status = 4;
683683
self.tabState = "discussion";
684684
self.$('.js-startDisputeFlag').addClass('hide');
685685
self.getData();
@@ -769,7 +769,7 @@ module.exports = baseModal.extend({
769769
refData.order_id = this.orderID;
770770

771771
saveToAPI(null, null, this.serverUrl + "refund", function () {
772-
self.status = 7;
772+
self.status = 7;
773773
self.tabState = "summary";
774774
self.getData();
775775
}, function (data) {

main.js

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ var fs = require('fs'),
2424
var launched_from_installer = false;
2525
var platform = os.platform();
2626
switch (platform) {
27-
case "darwin":
28-
platform = "mac";
27+
case "darwin":
28+
platform = "mac";
2929
}
3030
var version = app.getVersion();
3131
var trayMenu = null;
@@ -134,7 +134,7 @@ var kill_local_server = function() {
134134
};
135135

136136
var start_local_server = function() {
137-
if(fs.existsSync(serverPath)) {
137+
if (fs.existsSync(serverPath)) {
138138
if (pendingKill) {
139139
pendingKill.once('close', startAfterClose = () => {
140140
start_local_server();
@@ -167,18 +167,18 @@ var start_local_server = function() {
167167
subpy.stderr.on('data', function (buf) {
168168
console.log('[STR] stderr "%s"', String(buf));
169169
fs.appendFile(__dirname + path.sep + "python_error.log", String(buf), function(err) {
170-
if(err) {
171-
return console.log(err);
172-
}
170+
if (err) {
171+
return console.log(err);
172+
}
173173
});
174174
stderr += buf;
175175
});
176176
subpy.on('error', function (err) {
177177
console.log('Python error %s', String(err));
178178
fs.appendFile(__dirname + path.sep + "python_error.log", String(err), function(error) {
179-
if(error) {
180-
return console.log(error);
181-
}
179+
if (error) {
180+
return console.log(error);
181+
}
182182
});
183183
});
184184
subpy.on('close', function (code) {
@@ -192,12 +192,12 @@ var start_local_server = function() {
192192
mainWindow && mainWindow.webContents.executeJavaScript("console.log('Unable to find OpenBazaar-Server at: '" + serverPath + "')");
193193
}
194194
if (fs.existsSync(__dirname + path.sep + '..' + path.sep + 'gpg')) {
195-
process.env.PATH = __dirname + path.sep + '..' + path.sep + 'gpg' + path.sep + 'pub' + path.sep + ';' + process.env.PATH;
196-
}
195+
process.env.PATH = __dirname + path.sep + '..' + path.sep + 'gpg' + path.sep + 'pub' + path.sep + ';' + process.env.PATH;
196+
}
197197
};
198198

199199
// Check if we need to kick off the python server-daemon (Desktop app)
200-
if(fs.existsSync(__dirname + path.sep + ".." + path.sep + "OpenBazaar-Server" + path.sep + daemon)) {
200+
if (fs.existsSync(__dirname + path.sep + ".." + path.sep + "OpenBazaar-Server" + path.sep + daemon)) {
201201
global.launched_from_installer = launched_from_installer = true;
202202
}
203203

@@ -319,11 +319,11 @@ app.on('window-all-closed', function() {
319319

320320
// You can use 'before-quit' instead of (or with) the close event
321321
app.on('before-quit', function () {
322-
// Handle menu-item or keyboard shortcut quit here
323-
console.log('Closing Application');
324-
if (launched_from_installer) {
325-
kill_local_server();
326-
}
322+
// Handle menu-item or keyboard shortcut quit here
323+
console.log('Closing Application');
324+
if (launched_from_installer) {
325+
kill_local_server();
326+
}
327327
});
328328

329329
app.commandLine.appendSwitch('ignore-certificate-errors', true);
@@ -518,15 +518,15 @@ app.on('ready', function() {
518518
]
519519
},
520520
{
521-
label: 'Window',
522-
submenu: [
523-
{
524-
label: 'Minimize',
525-
selector: 'performMiniaturize:',
526-
accelerator: 'Command+M'
527-
}
528-
]
529-
}
521+
label: 'Window',
522+
submenu: [
523+
{
524+
label: 'Minimize',
525+
selector: 'performMiniaturize:',
526+
accelerator: 'Command+M'
527+
}
528+
]
529+
}
530530
]);
531531
menu.setApplicationMenu(appMenu);
532532

@@ -537,8 +537,8 @@ app.on('ready', function() {
537537
var template = [
538538
{
539539
label: 'Start Local Server', type: 'normal', click: function () {
540-
start_local_server();
541-
}
540+
start_local_server();
541+
}
542542
},
543543
{
544544
label: 'Shutdown Local Server', type: 'normal', click: function () {
@@ -579,7 +579,7 @@ app.on('ready', function() {
579579
}}
580580
];
581581

582-
if(launched_from_installer) {
582+
if (launched_from_installer) {
583583
template.push({label: 'View Python Error Log', type: 'normal', click: function() {
584584
var logPath = __dirname + path.sep + 'python_error.log';
585585
open(logPath);
@@ -615,7 +615,7 @@ app.on('ready', function() {
615615
});
616616

617617
// and load the index.html of the app.
618-
if(open_url) {
618+
if (open_url) {
619619
mainWindow.loadURL('file://' + __dirname + '/index.html' + open_url);
620620
} else {
621621
mainWindow.loadURL('file://' + __dirname + '/index.html');
@@ -666,13 +666,13 @@ app.on('ready', function() {
666666
});
667667

668668
var feedURL = 'https://updates.openbazaar.org:5001/update/' + platform + '/' + version;
669-
autoUpdater.setFeedURL(feedURL)
669+
autoUpdater.setFeedURL(feedURL);
670670
mainWindow.webContents.executeJavaScript("console.log('Checking for new versions at " + feedURL + " ...')");
671671

672672
// Check for updates every hour
673673
autoUpdater.checkForUpdates();
674674
setInterval(function () {
675-
autoUpdater.checkForUpdates();
675+
autoUpdater.checkForUpdates();
676676
}, 3600000);
677677

678678
});

valiquire-redirect.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ var electronModules = [
1818

1919
module.exports = function redirect(request) {
2020
// Tell valiquire to ignore these modules
21-
if(~electronModules.indexOf(request)) return null;
21+
if (~electronModules.indexOf(request)) {
22+
return null;
23+
}
2224

2325
// all others we don't redirect
2426
return request;

0 commit comments

Comments
 (0)