diff options
| author | Wu Cheng-Han | 2016-11-29 00:44:15 +0800 |
|---|---|---|
| committer | Wu Cheng-Han | 2016-11-29 00:44:15 +0800 |
| commit | 47d5efb29e086e8baef5debd1619b54c5b088005 (patch) | |
| tree | 196d2dc35e33c818b9c6d0659fec01ae5791aebb /public | |
| parent | ead48e45e0977e6376640b89f842f238ab382f94 (diff) | |
Fix slide resource path and style load orders to avoid conflicts
Diffstat (limited to '')
| -rw-r--r-- | public/js/slide.js | 4 | ||||
| -rw-r--r-- | public/views/slide.ejs | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/public/js/slide.js b/public/js/slide.js index fa4adcb5..4962470e 100644 --- a/public/js/slide.js +++ b/public/js/slide.js @@ -36,7 +36,7 @@ function extend() { // Optional libraries used to extend on reveal.js var deps = [{ - src: serverurl + '/vendor/reveal.js/lib/js/classList.js', + src: serverurl + '/build/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } @@ -53,7 +53,7 @@ var deps = [{ $(".slides").show(); } }, { - src: serverurl + '/vendor/reveal.js/plugin/notes/notes.js', + src: serverurl + '/build/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; diff --git a/public/views/slide.ejs b/public/views/slide.ejs index bfc5eddf..0a2d8214 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -14,6 +14,10 @@ <title><%= title %></title> <link rel="icon" type="image/png" href="<%- url %>/favicon.png"> <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png"> + + <!-- For reveal.js --> + <link rel="stylesheet" href="<%- url %>/build/reveal.js/css/reveal.css"> + <% if(useCDN) { %> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" /> @@ -25,11 +29,10 @@ <%- include build/slide-pack-header %> <% } %> - <!-- For reveal.js --> - <link rel="stylesheet" href="<%- url %>/vendor/reveal.js/css/reveal.css"> - <link rel="stylesheet" href="<%- url %>/vendor/reveal.js/css/theme/black.css" id="theme"> + <!-- For reveal.js theme --> + <link rel="stylesheet" href="<%- url %>/build/reveal.js/css/theme/black.css" id="theme"> <!-- For syntax highlighting --> - <link rel="stylesheet" href="<%- url %>/vendor/reveal.js/lib/css/zenburn.css"> + <link rel="stylesheet" href="<%- url %>/build/reveal.js/lib/css/zenburn.css"> <!-- For overwrite reveal.js --> <link rel="stylesheet" href="<%- url %>/css/slide.css"> @@ -38,7 +41,7 @@ var link = document.createElement( 'link' ); link.rel = 'stylesheet'; link.type = 'text/css'; - link.href = '<%- url %>/vendor/reveal.js/' + (window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css'); + link.href = '<%- url %>/build/reveal.js/' + (window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css'); document.getElementsByTagName( 'head' )[0].appendChild( link ); </script> |