entrouvert
/
momo
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'release/1.0.4' 

Conflicts:
	www/js/index.js
This commit is contained in:
Ghislain Loaec 2015-10-15 10:56:49 +02:00
parent c22af363f3 e08f7bdff2
commit b4c2e588a0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/js/index.js
View File

@ -326,7 +326,13 @@ var app = {
var updateError = false;
if(!app.online){
app.utils.setLoadingMsg("L'application est hors-ligne");
var msg = "Impossible de détecter une mise à jour car votre appareil n'est pas connecté à Internet. ";
var updatedAt = localStorage.getItem('momo-updated-at');
if(updatedAt){
msg += "Pour information, la dernière mise à jour date du " + app.utils.formatDate(new Date(updatedAt)) + ".";
}
app.utils.setLoadingMsg("Application hors-ligne");
app.flash(msg, 'danger');
if(typeof resolve === 'function'){
resolve(false);
}
@ -1366,6 +1372,7 @@ var app = {
function(){
localStorage.setItem('momo-manifest-mtime', app.manifestMtime);
localStorage.setItem('momo-assets-mtime', app.assetsMtime);
localStorage.setItem('momo-updated-at', new Date());
loadAssets(resolve, reject);
},
function(){