diff --git a/bower.json b/bower.json index d9923e2..7b5e05a 100644 --- a/bower.json +++ b/bower.json @@ -30,7 +30,8 @@ "velocity": "^1.3.1", "randomcolor": "randomColor#^0.4.4", "Idle.Js": "idle.js#^1.0.0", - "gist-embed": "*" + "gist-embed": "*", + "jquery-scrollspy": "softwarespot/jquery-scrollspy" }, "resolutions": { "jquery": "~3.1.1" diff --git a/package.json b/package.json index 03333fb..6b313be 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "imgur": "git+https://github.com/hackmdio/node-imgur.git", "jquery": "^3.1.1", "jquery-mousewheel": "^3.1.13", - "jquery-scrollspy": "github:softwarespot/jquery-scrollspy", "jquery-textcomplete": "^1.7.3", "jquery-ui": "^1.12.1", "js-cookie": "^2.1.3", diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 696fe3b..4ba18e3 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -20,6 +20,7 @@ + <%- include build/index-scripts %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 0cd9e01..b0eb568 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -99,8 +99,9 @@ <% } %> - + + <%- include build/pretty-scripts %> diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index e38213b..7bf3657 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -78,8 +78,7 @@ module.exports = { slide: path.join(__dirname, 'public/js/slide.js'), locale: path.join(__dirname, 'public/js/locale.js'), vendor: [ - "jquery-mousewheel", - "jquery-scrollspy/jquery-scrollspy", + "imports?$=jquery!jquery-mousewheel", "jquery-ui/ui/widgets/resizable", "jquery-ui/ui/widgets/tooltip", "jquery-ui/ui/widgets/controlgroup",