From 83be3465ccd4bdc43cdfc14f253c236e2f44379e Mon Sep 17 00:00:00 2001
From: Yukai Huang <yukaihuangtw@gmail.com>
Date: Thu, 13 Oct 2016 13:59:34 +0800
Subject: [PATCH] Fix scrollspy

---
 bower.json              | 3 ++-
 package.json            | 1 -
 public/views/foot.ejs   | 1 +
 public/views/pretty.ejs | 3 ++-
 webpackBaseConfig.js    | 3 +--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bower.json b/bower.json
index d9923e2c..7b5e05aa 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 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",