aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud CHESNAY <arnaud.chesnay@etu.univ-nantes.fr>2017-09-27 10:33:57 +0200
committerArnaud CHESNAY <arnaud.chesnay@etu.univ-nantes.fr>2017-09-27 10:33:57 +0200
commit05dc714ca64a68bd68cd535788cf941f74357802 (patch)
tree87756aec35c2e6b8232bdc16f9740e3b691c497c
parentfavicon (diff)
parenttransition (diff)
Merge branch 'master' of github.com:Titely/markdown-viewer
-rw-r--r--public/404.md2
-rw-r--r--public/index.html8
-rw-r--r--public/js/script.js4
3 files changed, 2 insertions, 12 deletions
diff --git a/public/404.md b/public/404.md
index 5367983..088b35d 100644
--- a/public/404.md
+++ b/public/404.md
@@ -1,4 +1,4 @@
# 404
-## Teapot not found
+**Teapot not found**
The page you are looking for does not exists
diff --git a/public/index.html b/public/index.html
index e78a9f4..97d47a9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,14 +19,8 @@
<div id="tree" class="col-lg-2">
</div>
- <div class="col-lg-10">
- <div class="spinner">
- <div class="double-bounce1"></div>
- <div class="double-bounce2"></div>
- </div>
- <div id="md">
+ <div id="md" class="col-lg-10">
- </div>
</div>
</div>
</div>
diff --git a/public/js/script.js b/public/js/script.js
index a7026fa..42367ef 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -3,16 +3,12 @@ $(document).ready(function() {
$('#tree').append(addDirectory(data));
$('a').click(function(e) {
- $('#md').empty();
- $('.spinner').show();
e.preventDefault();
$.get(this.href, function(data) {
- $('.spinner').hide();
$('#md').html(data);
});
});
});
- $('.spinner').hide();
});
function addDirectory(data) {