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

Assets.zip test + Fix Whitelist permissions

This commit is contained in:
Ghislain Loaec 2015-08-14 00:02:22 +02:00
parent afee092a50
commit fa7caeed8d
2 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/index.html
View File

@ -29,7 +29,8 @@
<meta http-Equiv="Pragma" Content="no-cache" />
<meta http-Equiv="Expires" Content="0" />
<!-- Enable all requests, inline styles, and eval() -->
<meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'">
<meta http-equiv="Content-Security-Policy" content="default-src *;
style-src * 'unsafe-inline'; script-src * 'unsafe-inline' 'unsafe-eval'">
<!-- WARNING: for iOS 7, remove the width=device-width and height=device-height attributes. See https://issues.apache.org/jira/browse/CB-4323 -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, target-densitydpi=medium-dpi, user-scalable=0" />

88
www/js/index.js
View File

@ -327,53 +327,51 @@ var app = {
var uri = encodeURI(app.manifest.meta.assetsUrl);
var filePath = fileSystem.root.toURL() + uri.substr(uri.lastIndexOf("/") + 1);
zip.unzip(uri, rootPath,
// Success callback
function(ret){
app.utils.setLoadingMsg("Téléchargement des assets - 100%");
if(ret == 0) {
if(typeof resolve === 'function')
resolve();
} else
if(ret == -1) {
if(typeof reject === 'function')
reject();
}
},
// Progress callback
function(e){
var progress = Math.round((e.loaded / e.total) * 100);
app.utils.setLoadingMsg("Téléchargement des assets - "+progress+"%");
});
// Fetch Assets Zip Archive
//fileTransfer.download(
// // Source
// uri,
// // Destination
// filePath,
// // Success callback
// function(entry) {
// app.utils.setLoadingMsg("Extraction de la mise à jour");
// // Unzip Assets
// zip.unzip(filePath, rootPath, function(){
// if(DEBUG) console.log('unzip success');
// cb();
// });
// },
// // Error callback
// function(error) {
// if(DEBUG) console.log("download error source " + error.source);
// if(DEBUG) console.log("download error target " + error.target);
// if(DEBUG) console.log("upload error code" + error.code);
// cb();
// },
// // Misc
// false,
// {
// headers: {}
// }
//);
fileTransfer.download(
// Source
uri,
// Destination
filePath,
// Success callback
function(entry) {
app.utils.setLoadingMsg("Extraction de la mise à jour");
// Unzip Assets
zip.unzip(filePath, rootPath,
// Success callback
function(ret){
if(DEBUG) console.log('unzip success');
app.utils.setLoadingMsg("Téléchargement des assets - 100%");
if(ret == 0) {
if(typeof resolve === 'function')
resolve();
} else
if(ret == -1) {
if(typeof reject === 'function')
reject();
}
},
// Progress callback
function(e){
var progress = Math.round((e.loaded / e.total) * 100);
app.utils.setLoadingMsg("Téléchargement des assets - "+progress+"%");
}
);
},
// Error callback
function(error) {
if(DEBUG) console.log("download error source " + error.source);
if(DEBUG) console.log("download error target " + error.target);
if(DEBUG) console.log("upload error code" + error.code);
cb();
},
// Misc
false,
{
headers: {}
}
);
}, function(error){
if(DEBUG) console.error('Filesystem error');
app.utils.setLoadingMsg("Erreur du système de fichier");