remove all jshint warns
This commit is contained in:
parent
59a34beda0
commit
3affbd43be
|
@ -8,13 +8,7 @@ function spec() {
|
||||||
var config = require('../config/config');
|
var config = require('../config/config');
|
||||||
var Block = require('../app/models/Block');
|
var Block = require('../app/models/Block');
|
||||||
var Transaction = require('../app/models/Transaction');
|
var Transaction = require('../app/models/Transaction');
|
||||||
<<<<<<< Updated upstream
|
|
||||||
var TransactionItem = require('../app/models/TransactionItem');
|
|
||||||
var sockets = require('../app/controllers/socket.js');
|
var sockets = require('../app/controllers/socket.js');
|
||||||
var CONCURRENCY = 5;
|
|
||||||
=======
|
|
||||||
var sockets = require('../app/views/sockets/main.js');
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
|
|
||||||
|
|
||||||
function Sync() {
|
function Sync() {
|
||||||
|
|
|
@ -72,11 +72,9 @@ if (!config.disableP2pSync) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// express app
|
// express app
|
||||||
|
/*global app: true*/
|
||||||
/*jshint validthis:true */
|
|
||||||
var app = express();
|
var app = express();
|
||||||
|
|
||||||
|
|
||||||
//express settings
|
//express settings
|
||||||
require('./config/express')(app, db);
|
require('./config/express')(app, db);
|
||||||
|
|
||||||
|
@ -86,7 +84,7 @@ require('./config/routes')(app);
|
||||||
// socket.io
|
// socket.io
|
||||||
var server = require('http').createServer(app);
|
var server = require('http').createServer(app);
|
||||||
var ios = require('socket.io').listen(server);
|
var ios = require('socket.io').listen(server);
|
||||||
require('./app/controllers/socket.js').init(app,io);
|
require('./app/controllers/socket.js').init(app,ios);
|
||||||
|
|
||||||
//Start the app by listening on <port>
|
//Start the app by listening on <port>
|
||||||
var port = process.env.PORT || config.port;
|
var port = process.env.PORT || config.port;
|
||||||
|
|
Loading…
Reference in New Issue