diff --git a/public/js/index.js b/public/js/index.js index 626799c..20a76ff 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,9 +1,6 @@ /* jquery and jquery plugins */ require('../vendor/showup/showup'); -/* bootstrap */ -require('bootstrap/dist/css/bootstrap.css'); - require('prismjs/themes/prism.css'); require('highlight.js/styles/github-gist.css'); @@ -15,6 +12,8 @@ var saveAs = require('file-saver').saveAs; require('js-url'); require('randomcolor'); +var _ = require("lodash"); + var List = require('list.js'); var common = require('./common.js'); diff --git a/public/js/public.js b/public/js/public.js index 5fd3fd7..ac95180 100644 --- a/public/js/public.js +++ b/public/js/public.js @@ -1,9 +1,6 @@ /* jquery and jquery plugins */ require('../vendor/showup/showup'); -/* bootstrap */ -require('bootstrap/dist/css/bootstrap.css'); - require('prismjs/themes/prism.css'); require('highlight.js/styles/github-gist.css'); diff --git a/public/js/slide.js b/public/js/slide.js index 1f4892f..257c60b 100644 --- a/public/js/slide.js +++ b/public/js/slide.js @@ -1,6 +1,3 @@ -require('bootstrap/js/tooltip'); -require('bootstrap/dist/css/bootstrap.css'); - require('prismjs/themes/prism.css'); /* other vendors plugin */ diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 323d18f..696fe3b 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -3,11 +3,8 @@ <% if(useCDN) { %> - - - @@ -20,6 +17,10 @@ <% } %> + + + + <%- include build/index-scripts %> diff --git a/public/views/head.ejs b/public/views/head.ejs index f4ba108..6788449 100644 --- a/public/views/head.ejs +++ b/public/views/head.ejs @@ -8,17 +8,16 @@ <% if(useCDN) { %> - - <% } else { %> - <% } %> + + diff --git a/public/views/index.ejs b/public/views/index.ejs index 0e41db5..0bc3dd5 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -195,7 +195,6 @@ ================================================== --> <% if(useCDN) { %> - @@ -205,6 +204,8 @@ <% } %> + + <%- include build/cover-scripts %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index ecce68d..0cd9e01 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -18,15 +18,14 @@ <% if(useCDN) { %> - - <% } else { %> - <% } %> + + @@ -90,8 +89,6 @@ MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); <% if(useCDN) { %> - - @@ -102,6 +99,9 @@ <% } %> + + + <%- include build/pretty-scripts %> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index 5b24ab4..79d7708 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -87,7 +87,6 @@ MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); <% if(useCDN) { %> - @@ -102,6 +101,8 @@ <% } %> + + <%- include build/slide-scripts %> diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index 8f377d3..e38213b 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -6,11 +6,13 @@ var HtmlWebpackPlugin = require('html-webpack-plugin'); module.exports = { plugins: [ new webpack.ProvidePlugin({ - '_': 'lodash', Visibility: "visibilityjs", Cookies: "js-cookie", emojify: "emojify.js", - key: "keymaster" + key: "keymaster", + $: "jquery", + jQuery: "jquery", + "window.jQuery": "jquery" }), new ExtractTextPlugin("[name].css"), new webpack.optimize.CommonsChunkPlugin({ @@ -76,7 +78,6 @@ module.exports = { slide: path.join(__dirname, 'public/js/slide.js'), locale: path.join(__dirname, 'public/js/locale.js'), vendor: [ - "expose?$!expose?jQuery!jquery", "jquery-mousewheel", "jquery-scrollspy/jquery-scrollspy", "jquery-ui/ui/widgets/resizable", @@ -86,7 +87,6 @@ module.exports = { "script!gist-embed", "expose?filterXSS!xss", "js-url", - "bootstrap", "expose?Spinner!spin.js", "script!Idle.Js", "expose?LZString!lz-string", @@ -127,7 +127,10 @@ module.exports = { }, externals: { - "viz.js": "Viz" + "viz.js": "Viz", + "socket.io-client": "io", + "lodash": "_", + "jquery": "$" }, module: {