Skip to content

Commit fb5d7e4

Browse files
jackycutejackycute
committed
Update npm and bower dependencies with related patch
1 parent b734eb9 commit fb5d7e4

8 files changed

Lines changed: 39 additions & 41 deletions

File tree

‎bower.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
],
1717
"dependencies": {
1818
"bootstrap": "~3.3.7",
19-
"jquery": "~3.1.0",
19+
"jquery": "~3.1.1",
2020
"font-awesome": "~4.6.3",
2121
"Ionicons": "ionicons#~2.0.1",
2222
"reveal.js": "~3.3.0",
2323
"jquery-mousewheel": "~3.1.13",
2424
"spin.js": "~2.3.2",
25-
"moment": "~2.14.1",
25+
"moment": "~2.15.1",
2626
"handlebars": "~4.0.5",
2727
"js-url": "~2.3.0",
28-
"socket.io-client": "~1.4.8",
28+
"socket.io-client": "~1.5.0",
2929
"viz.js": "~1.3.0",
3030
"js-yaml": "~3.6.1",
3131
"to-markdown": "~3.0.1",
3232
"lz-string": "~1.4.4",
33-
"raphael": "~2.2.1",
33+
"raphael": "~2.2.6",
3434
"flowchart": "~1.6.3",
3535
"xss": "~0.2.13",
36-
"markdown-it": "^7.0.0",
36+
"markdown-it": "^8.0.0",
3737
"markdown-it-abbr": "^1.0.4",
3838
"markdown-it-footnote": "^3.0.1",
3939
"markdown-it-deflist": "^2.0.1",
@@ -45,23 +45,23 @@
4545
"mermaid": "^6.0.0",
4646
"MathJax": "^2.6.1",
4747
"octicons": "~3.5.0",
48-
"velocity": "^1.2.3",
49-
"highlightjs": "^9.5.0",
50-
"lodash": "^4.14.1",
48+
"velocity": "^1.3.1",
49+
"highlightjs": "^9.7.0",
50+
"lodash": "^4.16.4",
5151
"randomcolor": "randomColor#^0.4.4",
5252
"file-saver": "FileSaver#^1.3.1",
5353
"Idle.Js": "idle.js#^1.0.0",
54-
"js-cookie": "^2.1.2",
54+
"js-cookie": "^2.1.3",
5555
"list.js": "^1.2.0",
5656
"store-js": "store.js#^1.3.20",
5757
"string": "^3.3.1",
58-
"visibilityjs": "^1.2.3",
58+
"visibilityjs": "^1.2.4",
5959
"pdfobject": "pdfobject2#*",
6060
"gist-embed": "*",
6161
"keymaster": "^1.6.3",
6262
"prism": "^1.5.1"
6363
},
6464
"resolutions": {
65-
"jquery": "~3.1.0"
65+
"jquery": "~3.1.1"
6666
}
6767
}

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@
66
"license": "MIT",
77
"dependencies": {
88
"async": "^2.0.1",
9-
"blueimp-md5": "^2.3.0",
9+
"blueimp-md5": "^2.4.0",
1010
"body-parser": "^1.15.2",
1111
"chance": "^1.0.4",
12-
"cheerio": "^0.20.0",
12+
"cheerio": "^0.22.0",
1313
"compression": "^1.6.2",
14-
"connect-session-sequelize": "^3.1.0",
14+
"connect-session-sequelize": "^3.2.0",
1515
"cookie": "0.3.1",
1616
"cookie-parser": "1.4.3",
1717
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
18-
"ejs": "^2.5.1",
18+
"ejs": "^2.5.2",
1919
"emojify.js": "^1.1.0",
2020
"express": ">=4.14",
21-
"express-session": "^1.14.0",
21+
"express-session": "^1.14.1",
2222
"formidable": "^1.0.17",
23-
"helmet": "^2.1.2",
23+
"helmet": "^2.3.0",
2424
"i18n": "^0.8.3",
2525
"imgur": "git+https://github.com/hackmdio/node-imgur.git",
2626
"jsdom-nogyp": "^0.8.3",
2727
"lz-string": "1.4.4",
28-
"markdown-it": "^7.0.0",
28+
"markdown-it": "^8.0.0",
2929
"markdown-pdf": "^7.0.0",
30-
"meta-marked": "^0.4.1",
30+
"meta-marked": "^0.4.2",
3131
"method-override": "^2.3.6",
32-
"moment": "^2.14.1",
32+
"moment": "^2.15.1",
3333
"morgan": "^1.7.0",
3434
"mysql": "^2.11.1",
3535
"node-uuid": "^1.4.7",
@@ -41,16 +41,16 @@
4141
"passport-google-oauth20": "^1.0.0",
4242
"passport-twitter": "^1.0.4",
4343
"passport.socketio": "^3.6.2",
44-
"pg": "^6.0.3",
44+
"pg": "^6.1.0",
4545
"pg-hstore": "^2.3.2",
4646
"randomcolor": "^0.4.4",
47-
"request": "^2.74.0",
47+
"request": "^2.75.0",
4848
"reveal.js": "3.3.0",
49-
"sequelize": "^3.23.6",
49+
"sequelize": "^3.24.3",
5050
"sequelize-cli": "^2.4.0",
5151
"shortid": "2.2.6",
52-
"socket.io": "1.4.8",
53-
"sqlite3": "^3.1.4",
52+
"socket.io": "1.5.0",
53+
"sqlite3": "^3.1.6",
5454
"string": "^3.3.1",
5555
"tedious": "^1.14.0",
5656
"toobusy-js": "^0.5.1",

‎public/js/index.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2262,8 +2262,6 @@ socket.on('connect', function (data) {
22622262
personalInfo['id'] = socket.id;
22632263
showStatus(statusType.connected);
22642264
socket.emit('version');
2265-
if (socket.id.indexOf('/') == -1)
2266-
socket.id = socket.nsp + '#' + socket.id;
22672265
});
22682266
socket.on('version', function (data) {
22692267
if (version != data.version) {

‎public/views/foot.ejs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
</script>
44
<% if(useCDN) { %>
55
<script src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js" defer></script>
6-
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
7-
<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js" defer></script>
6+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
7+
<script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script>
88
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js" defer></script>
99
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
10-
<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.8/socket.io.min.js" defer></script>
10+
<script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.5.0/socket.io.min.js" defer></script>
1111
<script src="//cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script>
1212
<script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
13-
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script>
13+
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
1414
<script src="//cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
1515
<% } else { %>
1616
<script src="<%- url %>/vendor/spin.js/spin.min.js" defer></script>

‎public/views/html.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
2020
<link rel="stylesheet" href="https://cdn.jsdelivr.net/ionicons/2.0.1/css/ionicons.min.css">
2121
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css">
22-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/9.5.0/styles/github-gist.min.css">
22+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/highlight.js/9.7.0/styles/github-gist.min.css">
2323
<style>
2424
{{{css}}}
2525
</style>
@@ -47,7 +47,7 @@
4747
<div id="ui-toc-affix" class="ui-affix-toc ui-toc-dropdown unselectable hidden-print" data-spy="affix" style="top:17px;display:none;" {{{lang}}} {{{dir}}}>
4848
{{{ui-toc-affix}}}
4949
</div>
50-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
50+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
5151
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
5252
<script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.5/gist-embed.min.js" defer></script>
5353
<script>

‎public/views/index.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@
193193
================================================== -->
194194
<!-- Placed at the end of the document so the pages load faster -->
195195
<% if(useCDN) { %>
196-
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js" defer></script>
197-
<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js" defer></script>
196+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" defer></script>
197+
<script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script>
198198
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
199199
<script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script>
200-
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script>
200+
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
201201
<script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.3.0/url.min.js" defer></script>
202202
<% } else { %>
203203
<script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script>

‎public/views/pretty.ejs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }});
9393
</script>
9494
<% if(useCDN) { %>
95-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
95+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
9696
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
9797
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script>
9898
<script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
99-
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script>
99+
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
100100
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
101101
<% } else { %>
102102
<script src="<%- url %>/vendor/jquery/dist/jquery.min.js"></script>

‎public/views/slide.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }});
8888
</script>
8989
<% if(useCDN) { %>
90-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
91-
<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js" defer></script>
90+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
91+
<script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script>
9292
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script>
9393
<script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
94-
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script>
94+
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
9595
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
9696
<% } else { %>
9797
<script src="<%- url %>/vendor/jquery/dist/jquery.min.js"></script>

0 commit comments

Comments
 (0)