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

Merge branch 'release/0.0.9'

This commit is contained in:
Ghislain Loaec 2015-08-05 01:06:44 +02:00
parent 40b421fed1 ca5d5ae74e
commit 8b4af0ebc6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/js/index.js
View File

@ -209,14 +209,18 @@ var app = {
var rootPath = fileSystem.root.toURL();
// Patch path to local in manifest response
var manifestResponse = response.replace(/assets\//g, rootPath+'assets/');
var manifestResponse = response.replace(/(['"\(])\/?(assets\/^['"\)]*)(['"\)])/g, function(match, q1, path, q2){
return q1+rootPath+match+q2;
});
// Callback
cb(manifestResponse);
});
} else {
var manifestResponse = response.replace(/assets\//g, DEBUG_WWW_URL+'assets/');
var manifestResponse = response.replace(/(['"\(])\/?(assets\/^['"\)]*)(['"\)])/g, function(match, q1, path, q2){
return q1+rootPath+match+q2;
});
cb(manifestResponse);
}
},
@ -313,6 +317,7 @@ var app = {
app.manifest.id = app.current_page = 'home';
// Dev page refresh : redirect to home
window.location.replace('#');
window.location.hash = '#home'
// Import Scripts & Styles
@ -477,6 +482,9 @@ var app = {
var $outpage = document.getElementById(app.current_page);
var $inpage = document.getElementById(page);
// Render page (with small hack, so it doesn't mess up the display)
$inpage.innerHTML = app.renderPage(page_obj);
if(!ANIMATION_ENABLED){
$inpage.classList.add('momo-page-current');
$outpage.classList.remove('momo-page-current');
@ -513,7 +521,6 @@ var app = {
$outpage.addEventListener('MSAnimationEnd', outCb, false);
$inpage.classList.add('momo-page-current');
$inpage.innerHTML = app.renderPage(page_obj);
var in_classes = (back ? ANIMATION_BACK_IN_CLASS : ANIMATION_IN_CLASS).split(' ');
for(var i = 0; i < in_classes.length; i++)