connectivity checks disabled
This commit is contained in:
parent
72723e8549
commit
c02d3b645f
|
@ -287,18 +287,12 @@
|
|||
{% } %}
|
||||
|
||||
{% if(!(o.url && o.url.isImage())){ %}
|
||||
<div class="offline-visible">
|
||||
{%# tmpl('momo-offline-tmpl', o) %}
|
||||
</div>
|
||||
<div class="momo-flash-messages"></div>
|
||||
<div class="container-fluid">
|
||||
<section class="momo-page-content">{%# o.content %}</section>
|
||||
</div>
|
||||
{% } else { %}
|
||||
<div class="momo-image-viewer" style="background-image: url('{%# o.url %}');">
|
||||
<div class="offline-visible hidden">
|
||||
{%# tmpl('momo-offline-tmpl', o) %}
|
||||
</div>
|
||||
<div class="momo-flash-messages"></div>
|
||||
<div class="container-fluid momo-page-content-parent">
|
||||
<section class="momo-page-content">{%# o.content %}</section>
|
||||
|
|
|
@ -71,7 +71,7 @@ var app = {
|
|||
},
|
||||
|
||||
// Misc Data
|
||||
online : false,
|
||||
online : true,
|
||||
current : 0,
|
||||
isAnimating : false,
|
||||
endCurrPage : false,
|
||||
|
@ -109,10 +109,10 @@ var app = {
|
|||
}
|
||||
|
||||
// Phone Context
|
||||
if( window.isphone ) {
|
||||
if( window.isphone ) {
|
||||
document.addEventListener("deviceready", this.onDeviceReady, false);
|
||||
// Testing Context
|
||||
} else {
|
||||
} else {
|
||||
this.onDeviceReady();
|
||||
}
|
||||
},
|
||||
|
@ -165,9 +165,6 @@ var app = {
|
|||
// Check for new updates
|
||||
//app.checkForUpdate(app.start, app.start);
|
||||
|
||||
// Regulary check for connection
|
||||
setInterval( app.checkConnection, CHECK_FOR_CONNECTION_INTERVAL );
|
||||
|
||||
// Update Reminder
|
||||
app.updateTimeout = setTimeout( app.checkForLastUpdateCheck, app.manifest.meta.updateFreq );
|
||||
|
||||
|
@ -190,7 +187,7 @@ var app = {
|
|||
window.requestFileSystem(LocalFileSystem.TEMPORARY, 0,
|
||||
function(fileSystem){
|
||||
app.rootPath = fileSystem.root.toURL();
|
||||
},
|
||||
},
|
||||
function(err){
|
||||
if(DEBUG){ console.log('FileSystem unreachable'); }
|
||||
app.flash("Impossible d'écrire sur le périphérique", 'danger');
|
||||
|
@ -246,7 +243,7 @@ var app = {
|
|||
case Connection.CELL_2G:
|
||||
app.online = true;
|
||||
if(typeof resolve === "function"){
|
||||
resolve();
|
||||
resolve();
|
||||
}
|
||||
break;
|
||||
case Connection.NONE:
|
||||
|
@ -254,7 +251,7 @@ var app = {
|
|||
default:
|
||||
app.online = false;
|
||||
if(typeof reject === "function"){
|
||||
reject();
|
||||
reject();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -262,12 +259,12 @@ var app = {
|
|||
if(navigator.onLine){
|
||||
app.online = true;
|
||||
if(typeof resolve === "function"){
|
||||
resolve();
|
||||
resolve();
|
||||
}
|
||||
} else {
|
||||
app.online = false;
|
||||
if(typeof reject === "function"){
|
||||
reject();
|
||||
reject();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -321,7 +318,6 @@ var app = {
|
|||
|
||||
checkForUpdate: function(resolve, reject) {
|
||||
app.utils.setLoadingMsg("Vérification des mises à jour");
|
||||
app.checkConnection();
|
||||
|
||||
var manifestReady = false;
|
||||
var assetsReady = false;
|
||||
|
@ -440,7 +436,7 @@ var app = {
|
|||
|
||||
// Override meta
|
||||
app.manifest.meta = app.utils.extend(app.safeManifest.meta, app.manifest.meta);
|
||||
|
||||
|
||||
// Store manifest if parsable
|
||||
localStorage.setItem("momo-manifest", manifestResponse);
|
||||
|
||||
|
@ -490,7 +486,7 @@ var app = {
|
|||
// Store proper manifest
|
||||
localStorage.setItem("momo-manifest", JSON.stringify(app.safeManifest));
|
||||
|
||||
// Restore safe manifest
|
||||
// Restore safe manifest
|
||||
app.manifest = app.safeManifest;
|
||||
},
|
||||
|
||||
|
@ -547,10 +543,10 @@ var app = {
|
|||
// Fetch Assets Zip Archive
|
||||
fileTransfer.download(
|
||||
// Source
|
||||
uri,
|
||||
uri,
|
||||
// Destination
|
||||
filePath,
|
||||
// Success callback
|
||||
filePath,
|
||||
// Success callback
|
||||
function(entry) {
|
||||
app.utils.setLoadingMsg("Extraction de la mise à jour");
|
||||
// Unzip Assets
|
||||
|
@ -563,7 +559,7 @@ var app = {
|
|||
if(typeof resolve === 'function') {
|
||||
resolve();
|
||||
}
|
||||
} else
|
||||
} else
|
||||
if(ret === -1) {
|
||||
if(typeof reject === 'function') {
|
||||
reject();
|
||||
|
@ -645,7 +641,7 @@ var app = {
|
|||
script.src = file;
|
||||
document.getElementsByTagName("head")[0].appendChild(script);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// Refresh stylesheets
|
||||
|
@ -670,7 +666,7 @@ var app = {
|
|||
link.href = file;
|
||||
document.getElementsByTagName("head")[0].appendChild(link);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -745,12 +741,12 @@ var app = {
|
|||
|
||||
// Default route to home
|
||||
app.manifest.id = app.currentPage = 'home';
|
||||
|
||||
|
||||
// Dev page refresh : redirect to home
|
||||
window.location.replace('#home');
|
||||
// Regiter pages tree
|
||||
app.registerPage(app.manifest, app.defaultPage);
|
||||
|
||||
|
||||
// Render Homepage
|
||||
app.render(app.manifest);
|
||||
|
||||
|
@ -779,7 +775,7 @@ var app = {
|
|||
|
||||
// Extends default page
|
||||
data = app.utils.extend(app.defaultPage, data);
|
||||
|
||||
|
||||
// Set page's parent
|
||||
data.parent = parentPage;
|
||||
|
||||
|
@ -883,7 +879,7 @@ var app = {
|
|||
body: data.content,
|
||||
keywords: data.keywords
|
||||
});
|
||||
|
||||
|
||||
// Return ID string
|
||||
return data.id;
|
||||
} else
|
||||
|
@ -1017,9 +1013,6 @@ var app = {
|
|||
// Render page (with small hack, so it doesn't mess up the display)
|
||||
$inpage.innerHTML = app.renderPage(page_obj, force);
|
||||
|
||||
// Check for connection
|
||||
app.checkConnection();
|
||||
|
||||
// Pull to update binder
|
||||
app.bindPagePull($inpage);
|
||||
|
||||
|
@ -1121,7 +1114,7 @@ var app = {
|
|||
|
||||
// Location Hash change event (sorry & good luck)
|
||||
onHashChange: function(e) {
|
||||
var hash = window.location.hash,
|
||||
var hash = window.location.hash,
|
||||
length = window.history.length,
|
||||
page = window.location.hash.slice(1),
|
||||
prev, next;
|
||||
|
@ -1162,7 +1155,7 @@ var app = {
|
|||
app.ignoreHash = false;
|
||||
app.previousPage = page;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
if(page === 'momo-back'){
|
||||
prev = app.pages[app.currentPage].prev;
|
||||
|
@ -1220,7 +1213,7 @@ var app = {
|
|||
|
||||
if(!app.pages.hasOwnProperty(page)){
|
||||
page = 'home';
|
||||
}
|
||||
}
|
||||
|
||||
var back = page === 'home';
|
||||
|
||||
|
@ -1230,7 +1223,7 @@ var app = {
|
|||
// Goind Back
|
||||
if (app.pageHistory[app.pageIndex - 1] === page) {
|
||||
//app.pageHistory = app.pageHistory.slice(0, app.pageIndex);
|
||||
back = true;
|
||||
back = true;
|
||||
app.pageIndex--;
|
||||
} else
|
||||
// Going Forward
|
||||
|
@ -1331,14 +1324,14 @@ var app = {
|
|||
setTimeout(function(){
|
||||
var elements = document.getElementsByClassName("momo-flash-messages");
|
||||
for (i = 0; i < elements.length; i++){
|
||||
elements[i].innerHTML += tmpl('momo-flash-message-tmpl', {
|
||||
elements[i].innerHTML += tmpl('momo-flash-message-tmpl', {
|
||||
message: message,
|
||||
type: type ? type : 'info'
|
||||
type: type ? type : 'info'
|
||||
});
|
||||
}
|
||||
}, 200);
|
||||
},
|
||||
|
||||
|
||||
update: function( resolve, reject ) {
|
||||
var els = document.getElementsByTagName("a"),
|
||||
els_length = els.length;
|
||||
|
@ -1353,7 +1346,7 @@ var app = {
|
|||
app.appendAssets(
|
||||
function(){
|
||||
app.reset(_resolve, _reject);
|
||||
},
|
||||
},
|
||||
function(){
|
||||
app.reset(_reject, _reject);
|
||||
}
|
||||
|
@ -1363,7 +1356,7 @@ var app = {
|
|||
var loadAssets = function(_resolve, _reject){
|
||||
app.loadAssets(
|
||||
function(){
|
||||
appendAssets(_resolve, _reject);
|
||||
appendAssets(_resolve, _reject);
|
||||
},
|
||||
function(){
|
||||
app.reset(_reject, _reject);
|
||||
|
@ -1642,17 +1635,17 @@ var app = {
|
|||
|
||||
clone: function (obj){
|
||||
var copy;
|
||||
|
||||
|
||||
// Handle the 3 simple types, and null or undefined
|
||||
if (null === obj || "object" !== typeof obj){ return obj; }
|
||||
|
||||
|
||||
// Handle Date
|
||||
if (obj instanceof Date) {
|
||||
copy = new Date();
|
||||
copy.setTime(obj.getTime());
|
||||
return copy;
|
||||
}
|
||||
|
||||
|
||||
// Handle Array
|
||||
if (obj instanceof Array) {
|
||||
copy = [];
|
||||
|
@ -1661,7 +1654,7 @@ var app = {
|
|||
}
|
||||
return copy;
|
||||
}
|
||||
|
||||
|
||||
// Handle Object
|
||||
if (obj instanceof Object) {
|
||||
copy = {};
|
||||
|
@ -1670,7 +1663,7 @@ var app = {
|
|||
}
|
||||
return copy;
|
||||
}
|
||||
|
||||
|
||||
throw new Error("Unable to copy obj! Its type isn't supported.");
|
||||
},
|
||||
|
||||
|
|
Reference in New Issue