fixed many bugs
This commit is contained in:
1 parent
7e54032605
commit
61f32a74da
10 files changed
+8402
-22
No files matched your search
@@ -85,9 +85,15 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
|
||||
|
||||
playersTable.decryptPlayerList = function(encryptedPlayerList){
|
||||
var keyLengthInBytes = 128;
|
||||
var key = spritz.hash(window.secret, keyLengthInBytes);
|
||||
var key = spritz.hash(localStorage.getItem('secret') || '', keyLengthInBytes);
|
||||
var decryptedMessage = spritz.decrypt(key, encryptedPlayerList);
|
||||
return JSON.parse(spritz.utf8ByteArrayToString(decryptedMessage));
|
||||
try{
|
||||
return JSON.parse(spritz.utf8ByteArrayToString(decryptedMessage));
|
||||
}catch(e){
|
||||
localStorage.removeItem('secret');
|
||||
m.route('/membre');
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
playersTable.getEncryptedPlayerList = function(){
|
||||
@@ -96,20 +102,19 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
|
||||
if(!_.isEmpty(window.encryptedPlayerList)){
|
||||
clearInterval(interval);
|
||||
deferred.resolve(window.encryptedPlayerList);
|
||||
m.redraw();
|
||||
m.redraw();
|
||||
}
|
||||
}, 333);
|
||||
return deferred.promise;
|
||||
};
|
||||
|
||||
playersTable.controller = function(model){
|
||||
var players = m.prop([]);
|
||||
var ctrl = {};
|
||||
ctrl.model = model;
|
||||
|
||||
ctrl.players = playersTable.getEncryptedPlayerList()
|
||||
.then(playersTable.decryptPlayerList)
|
||||
.then(players);
|
||||
.then(playersTable.decryptPlayerList);
|
||||
|
||||
ctrl.sortPlayers = function(){
|
||||
ctrl.players(playersTable._sortPlayers(ctrl.model.sorting, ctrl.players()));
|
||||
};
|
||||
@@ -205,7 +210,7 @@ define(['m', '_', 'spritz', 'teams'], function (m, _ , spritz, teams) {
|
||||
m('td', ''),
|
||||
m('td[colspan=3]',
|
||||
m('ul', [
|
||||
m('li', [m('b', 'tel: '), playersTaguble.playerTelLink(player)]),
|
||||
m('li', [m('b', 'tel: '), playersTable.playerTelLink(player)]),
|
||||
m('li', [m('b', 'email: '), player.email])
|
||||
]))
|
||||
]);
|
||||
|
||||
Reference in new issue
Block a user