status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix scrollspy

This commit is contained in:
Yukai Huang 2016-10-13 13:59:34 +08:00
parent af461ac2d6
commit 83be3465cc
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -30,7 +30,8 @@
"velocity": "^1.3.1", "velocity": "^1.3.1",
"randomcolor": "randomColor#^0.4.4", "randomcolor": "randomColor#^0.4.4",
"Idle.Js": "idle.js#^1.0.0", "Idle.Js": "idle.js#^1.0.0",
"gist-embed": "*" "gist-embed": "*",
"jquery-scrollspy": "softwarespot/jquery-scrollspy"
}, },
"resolutions": { "resolutions": {
"jquery": "~3.1.1" "jquery": "~3.1.1"

1
package.json
View File

@ -37,7 +37,6 @@
"imgur": "git+https://github.com/hackmdio/node-imgur.git", "imgur": "git+https://github.com/hackmdio/node-imgur.git",
"jquery": "^3.1.1", "jquery": "^3.1.1",
"jquery-mousewheel": "^3.1.13", "jquery-mousewheel": "^3.1.13",
"jquery-scrollspy": "github:softwarespot/jquery-scrollspy",
"jquery-textcomplete": "^1.7.3", "jquery-textcomplete": "^1.7.3",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"js-cookie": "^2.1.3", "js-cookie": "^2.1.3",

1
public/views/foot.ejs
View File

@ -20,6 +20,7 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></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="//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="//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/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> <script src="//cdnjs.cloudflare.com/ajax/libs/viz.js/1.3.0/viz.js" defer></script>
<%- include build/index-scripts %> <%- include build/index-scripts %>

3
public/views/pretty.ejs
View File

@ -99,8 +99,9 @@
<script src="<%- url %>/vendor/moment/min/moment-with-locales.js" defer></script> <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="<%- 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="//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/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> <script src="//cdnjs.cloudflare.com/ajax/libs/viz.js/1.3.0/viz.js" defer></script>
<%- include build/pretty-scripts %> <%- include build/pretty-scripts %>

3
webpackBaseConfig.js
View File

@ -78,8 +78,7 @@ module.exports = {
slide: path.join(__dirname, 'public/js/slide.js'), slide: path.join(__dirname, 'public/js/slide.js'),
locale: path.join(__dirname, 'public/js/locale.js'), locale: path.join(__dirname, 'public/js/locale.js'),
vendor: [ vendor: [
"jquery-mousewheel", "imports?$=jquery!jquery-mousewheel",
"jquery-scrollspy/jquery-scrollspy",
"jquery-ui/ui/widgets/resizable", "jquery-ui/ui/widgets/resizable",
"jquery-ui/ui/widgets/tooltip", "jquery-ui/ui/widgets/tooltip",
"jquery-ui/ui/widgets/controlgroup", "jquery-ui/ui/widgets/controlgroup",