Skip to content

Commit 96931e6

Browse files
committed
Upgrade all dependencies and fixes afterward issues
1 parent 4073909 commit 96931e6

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
"gsap": "greensock#~1.18.0",
2626
"jquery-mousewheel": "~3.1.13",
2727
"spin.js": "~2.3.2",
28-
"moment": "~2.10.6",
28+
"moment": "~2.11.1",
2929
"handlebars": "~4.0.5",
30-
"js-url": "~2.0.2",
31-
"socket.io-client": "~1.3.7",
30+
"js-url": "~2.1.0",
31+
"socket.io-client": "~1.4.4",
3232
"viz.js": "~1.3.0",
33-
"js-yaml": "~3.4.6",
33+
"js-yaml": "~3.5.2",
3434
"to-markdown": "~1.3.0",
3535
"lz-string": "~1.4.4"
3636
}

lib/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//user
22
//external modules
33
var mongoose = require('mongoose');
4-
var md5 = require("blueimp-md5").md5;
4+
var md5 = require("md5");
55

66
//core
77
var config = require("../config.js");

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@
77
"private": true,
88
"license": "MIT",
99
"dependencies": {
10-
"async": "^1.5.0",
11-
"blueimp-md5": "^1.1.1",
12-
"body-parser": "^1.14.1",
10+
"async": "^1.5.2",
11+
"blueimp-md5": "^2.1.0",
12+
"body-parser": "^1.14.2",
1313
"chance": "^0.8.0",
1414
"cheerio": "^0.19.0",
1515
"compression": "^1.6.0",
16-
"connect-mongo": "^0.8.2",
16+
"connect-mongo": "^1.1.0",
1717
"kerberos": "0.0.17",
1818
"cookie": "0.2.3",
19-
"cookie-parser": "1.4.0",
19+
"cookie-parser": "1.4.1",
2020
"ejs": "^2.3.4",
2121
"emojify.js": "^1.1.0",
2222
"express": ">=4.13",
23-
"express-session": "^1.12.1",
23+
"express-session": "^1.13.0",
2424
"formidable": "^1.0.17",
25-
"highlight.js": "^9.0.0",
25+
"highlight.js": "^9.1.0",
2626
"imgur": "^0.1.7",
2727
"jsdom-nogyp": "^0.8.3",
2828
"lz-string": "1.4.4",
2929
"markdown-pdf": "^6.0.0",
3030
"marked": "^0.3.5",
3131
"meta-marked": "^0.4.0",
3232
"method-override": "^2.3.5",
33-
"moment": "^2.10.6",
34-
"mongoose": "^4.3.1",
33+
"moment": "^2.11.1",
34+
"mongoose": "^4.3.6",
3535
"morgan": "^1.6.1",
3636
"node-uuid": "^1.4.7",
3737
"passport": "^0.3.2",
@@ -41,9 +41,9 @@
4141
"passport-twitter": "^1.0.3",
4242
"passport.socketio": "^3.6.1",
4343
"pg": "4.x",
44-
"randomcolor": "^0.4.2",
44+
"randomcolor": "^0.4.3",
4545
"shortid": "2.2.4",
46-
"socket.io": "1.3.7",
46+
"socket.io": "1.4.4",
4747
"string": "^3.3.1",
4848
"toobusy-js": "^0.4.2",
4949
"winston": "^2.1.1",

public/js/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,6 +1195,8 @@ socket.on('connect', function (data) {
11951195
personalInfo['id'] = socket.id;
11961196
showStatus(statusType.connected);
11971197
socket.emit('version');
1198+
if (socket.id.indexOf('/') == -1)
1199+
socket.id = socket.nsp + '#' + socket.id;
11981200
});
11991201
socket.on('version', function (data) {
12001202
if (data != version)

0 commit comments

Comments
 (0)