From 47d5efb29e086e8baef5debd1619b54c5b088005 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Tue, 29 Nov 2016 00:44:15 +0800
Subject: Fix slide resource path and style load orders to avoid conflicts
---
public/js/slide.js | 4 ++--
public/views/slide.ejs | 13 ++++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
(limited to 'public')
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 %>
+
+
+
+
<% if(useCDN) { %>
@@ -25,11 +29,10 @@
<%- include build/slide-pack-header %>
<% } %>
-
-
-
+
+
-
+
@@ -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 );
--
cgit v1.2.3