diff options
| author | Yukai Huang | 2016-10-13 13:59:34 +0800 |
|---|---|---|
| committer | Yukai Huang | 2016-10-13 13:59:34 +0800 |
| commit | 83be3465ccd4bdc43cdfc14f253c236e2f44379e (patch) | |
| tree | 227278d594a5aa81f7abab670e4ec755f2d8825f | |
| parent | af461ac2d6171b6133701ce0817d14f18b4fd4b1 (diff) | |
Fix scrollspy
| -rw-r--r-- | bower.json | 3 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | public/views/foot.ejs | 1 | ||||
| -rw-r--r-- | public/views/pretty.ejs | 3 | ||||
| -rw-r--r-- | webpackBaseConfig.js | 3 |
5 files changed, 6 insertions, 5 deletions
@@ -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 03333fb8..6b313bef 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 696fe3b6..4ba18e3a 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -20,6 +20,7 @@ <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.4/lodash.min.js" defer></script> +<script src="<% url %>/vendor/jquery-scrollspy/jquery-scrollspy.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.5.0/socket.io.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/viz.js/1.3.0/viz.js" defer></script> <%- include build/index-scripts %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 0cd9e012..b0eb568f 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -99,8 +99,9 @@ <script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script> <script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script> <% } %> -<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> +<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script> +<script src="<% url %>/vendor/jquery-scrollspy/jquery-scrollspy.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.4/lodash.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/viz.js/1.3.0/viz.js" defer></script> <%- include build/pretty-scripts %> diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index e38213b3..7bf36572 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", |