tforgione/3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A lot of cleaning... jshint likes me now !

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-07-01 10:14:15 +02:00
parent 0af40f3484
commit fab183eaa7
68 changed files with 544 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
controllers/prototype/dbrequests.js vendored
View File

@@ -23,7 +23,7 @@ var Info = function(id, finishAction) {
self.release = release;
self.execute();
});
}
};
Info.prototype.execute = function() {
this.loadCameras();
@@ -32,7 +32,7 @@ Info.prototype.execute = function() {
this.loadResets();
this.loadPreviousNext();
this.loadHovered();
}
};
Info.prototype.tryMerge = function() {
// If not ready, do nothing
@@ -49,7 +49,7 @@ Info.prototype.tryMerge = function() {
this.merge();
this.finishAction(this.finalResult);
}
};
// Merges the results of every SQL requests done by the load... methods
Info.prototype.merge = function() {
@@ -76,7 +76,7 @@ Info.prototype.merge = function() {
// Add the next element in results and shift its table
this.finalResult.push(this.results[nextIndex].shift());
}
}
};
Info.prototype.loadCameras = function() {
var self = this;
@@ -114,7 +114,7 @@ Info.prototype.loadCameras = function() {
self.tryMerge();
}
);
}
};
Info.prototype.loadCoins = function() {
var self = this;
@@ -136,7 +136,7 @@ Info.prototype.loadCoins = function() {
self.tryMerge();
}
);
}
};
Info.prototype.loadArrows = function() {
var self = this;
@@ -158,7 +158,7 @@ Info.prototype.loadArrows = function() {
self.tryMerge();
}
);
}
};
Info.prototype.loadResets = function() {
var self = this;
@@ -179,7 +179,7 @@ Info.prototype.loadResets = function() {
self.tryMerge();
}
);
}
};
Info.prototype.loadPreviousNext = function () {
var self = this;
@@ -218,7 +218,7 @@ Info.prototype.loadPreviousNext = function () {
self.tryMerge();
}
);
}
};
Info.prototype.loadHovered = function() {
var self = this;
@@ -241,7 +241,7 @@ Info.prototype.loadHovered = function() {
self.tryMerge();
}
);
}
};
var UserCreator = function(finishAction) {
this.finishAction = finishAction;
@@ -253,7 +253,7 @@ var UserCreator = function(finishAction) {
self.release = release;
self.execute();
});
}
};
UserCreator.prototype.execute = function() {
var self = this;
@@ -265,7 +265,7 @@ UserCreator.prototype.execute = function() {
self.finish();
}
);
}
};
UserCreator.prototype.finish = function() {
this.release();
@@ -273,7 +273,7 @@ UserCreator.prototype.finish = function() {
this.release = null;
this.finishAction(this.finalResult);
}
};
var ExpCreator = function(user_id, scene_id, finishAction) {
this.finishAction = finishAction;
@@ -287,7 +287,7 @@ var ExpCreator = function(user_id, scene_id, finishAction) {
self.release = release;
self.execute();
});
}
};
ExpCreator.prototype.execute = function() {
var self = this;
@@ -301,7 +301,7 @@ ExpCreator.prototype.execute = function() {
});
}
);
}
};
ExpCreator.prototype.finish = function() {
this.release();
@@ -309,7 +309,7 @@ ExpCreator.prototype.finish = function() {
this.release = null;
this.finishAction(this.finalResult);
}
};
var UserIdChecker = function(id, finishAction) {
this.id = id;
@@ -321,7 +321,7 @@ var UserIdChecker = function(id, finishAction) {
self.release = release;
self.execute();
});
}
};
UserIdChecker.prototype.execute = function() {
var self = this;
@@ -333,7 +333,7 @@ UserIdChecker.prototype.execute = function() {
self.finish();
}
);
}
};
UserIdChecker.prototype.finish = function() {
this.release();
@@ -341,7 +341,7 @@ UserIdChecker.prototype.finish = function() {
this.release = null;
this.finishAction(this.finalResult);
}
};
var ExpIdChecker = function(id, finishAction) {
this.id = id;
@@ -353,7 +353,7 @@ var ExpIdChecker = function(id, finishAction) {
self.release = release;
self.execute();
});
}
};
ExpIdChecker.prototype.execute = function() {
var self = this;
@@ -369,7 +369,7 @@ ExpIdChecker.prototype.execute = function() {
self.finish();
}
);
}
};
ExpIdChecker.prototype.finish = function() {
this.release();
@@ -377,7 +377,7 @@ ExpIdChecker.prototype.finish = function() {
this.release = null;
this.finishAction(this.finalResult);
}
};
var ExpGetter = function(finishAction) {
this.finishAction = finishAction;
@@ -388,7 +388,7 @@ var ExpGetter = function(finishAction) {
self.release = release;
self.execute();
});
}
};
ExpGetter.prototype.execute = function() {
var self = this;
@@ -407,7 +407,7 @@ ExpGetter.prototype.execute = function() {
self.finish();
}
);
}
};
ExpGetter.prototype.finish = function() {
this.release();
@@ -415,7 +415,7 @@ ExpGetter.prototype.finish = function() {
this.release = null;
this.finishAction(this.finalResult);
}
};
var tryUser = function(id, callback) {
if (id !== undefined && id !== null) {
@@ -429,7 +429,7 @@ var tryUser = function(id, callback) {
} else {
new UserCreator(callback);
}
}
};
module.exports.getInfo = function(id, callback) { new Info(id, callback); };
module.exports.createUser = function(callback) { new UserCreator(callback); };

18
controllers/prototype/index.js vendored
View File

@@ -38,7 +38,7 @@ module.exports.index = function(req, res) {
res.render('index.jade', res.locals, function(err, result) {
res.send(result);
});
}
};
var generateSceneNumber = function(req, res) {
if (req.session.scenes !== undefined) {
@@ -49,7 +49,7 @@ var generateSceneNumber = function(req, res) {
}
return req.session.scenes[req.session.currentSceneIndex];
}
};
var sceneToFunction = function(scene) {
switch (scene) {
@@ -62,7 +62,7 @@ var sceneToFunction = function(scene) {
default:
return 'initPeach';
}
}
};
var protoHelper = function(template) {
return function(req, res) {
@@ -82,7 +82,7 @@ var protoHelper = function(template) {
});
});
};
}
};
module.exports.arrows = protoHelper('prototype_arrows.jade');
module.exports.viewports = protoHelper('prototype_viewports.jade');
@@ -94,7 +94,7 @@ module.exports.sponza = function(req, res) {
res.render('sponza.jade', res.locals, function(err, result) {
res.send(result);
});
}
};
module.exports.replay_info = function(req, res) {
res.setHeader('Content-Type', 'text/plain');
@@ -105,7 +105,7 @@ module.exports.replay_info = function(req, res) {
db.getInfo(id, function(results) {
res.send(JSON.stringify(results));
});
}
};
module.exports.replay = function(req, res, next) {
// Get id parameter
@@ -124,7 +124,7 @@ module.exports.replay = function(req, res, next) {
});
}
});
}
};
module.exports.replay_index = function(req, res, next) {
db.getAllExps(function(result) {
@@ -135,7 +135,7 @@ module.exports.replay_index = function(req, res, next) {
res.send(result);
});
});
}
};
module.exports.tutorial = function(req, res) {
@@ -144,4 +144,4 @@ module.exports.tutorial = function(req, res) {
res.render('tutorial.jade', res.lcals, function(err, result) {
res.send(result);
});
}
};

2
controllers/prototype/urls.js vendored
View File

@@ -8,4 +8,4 @@ module.exports = {
'/prototype/replay_info/:id': 'replay_info',
'/prototype/tutorial': 'tutorial',
'/prototype/sponza': 'sponza'
}
};