aboutsummaryrefslogtreecommitdiff
path: root/script.js
diff options
context:
space:
mode:
authorJoris Guyonvarch2015-02-15 13:13:13 +0100
committerJoris Guyonvarch2015-02-15 13:13:13 +0100
commit71c8155599ea59cb4acb888843fadfa43c21e2c5 (patch)
treed838d71eb1d711e77e2e5e8874e15472bf1a35b4 /script.js
parent65bc73c3ad675dec2f4c630532fe94f7f7a70ac4 (diff)
downloadmakeup-71c8155599ea59cb4acb888843fadfa43c21e2c5.tar.gz
makeup-71c8155599ea59cb4acb888843fadfa43c21e2c5.tar.bz2
makeup-71c8155599ea59cb4acb888843fadfa43c21e2c5.zip
Fix contact flash when loading a page
Diffstat (limited to 'script.js')
-rw-r--r--script.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/script.js b/script.js
index 07feacd..e662ebb 100644
--- a/script.js
+++ b/script.js
@@ -23,10 +23,12 @@
};
function router() {
- var url = location.hash.slice(2) || 'presentation';
- fetchFile('Pages/' + url + '.html', function(htmlData) {
- var viewElement = document.getElementById('content');
- viewElement.innerHTML = htmlData;
+ var url = location.hash.slice(1) || 'presentation';
+ var contentElement = document.getElementById('content');
+ fetchFile('Pages' + url + '.html', function(contentData) {
+ fetchFile('Pages/contact.html', function(contactData) {
+ contentElement.innerHTML = contentData + contactData;
+ });
});
}