Sotaro KARASAWA 11 лет назад
Родитель
Сommit
0f5823a916
4 измененных файлов с 7 добавлено и 7 удалено
  1. 1 1
      Gruntfile.js
  2. 3 3
      app.js
  3. 1 1
      lib/views/page.html
  4. 2 2
      package.json

+ 1 - 1
Gruntfile.js

@@ -71,7 +71,7 @@ module.exports = function(grunt) {
           '<%= dirs.jsDest %>/<%= pkg.name %>.js': [
             'bower_components/jquery/dist/jquery.js',
             'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
-            'node_modules/socket.io-client/dist/socket.io.js',
+            'node_modules/socket.io-client/socket.io.js',
             'bower_components/marked/lib/marked.js',
             'bower_components/jquery.cookie/jquery.cookie.js',
             'bower_components/highlightjs/highlight.pack.js',

+ 3 - 3
app.js

@@ -18,7 +18,6 @@ var express  = require('express')
   , http     = require('http')
   , facebook = require('facebook-node-sdk')
   , mongo    = require('mongoose')
-  , socketio = require('socket.io')
   , middleware = require('./lib/util/middlewares')
   , time     = require('time')
   , async    = require('async')
@@ -193,12 +192,13 @@ async.series([
       });
     }
 
-    var io = socketio.listen(server);
+    require('./lib/routes')(app);
+
+    var io = require('socket.io')(server);
     io.sockets.on('connection', function (socket) {
     });
 
     app.set('io', io);
-    require('./lib/routes')(app);
 
     next();
   }

+ 1 - 1
lib/views/page.html

@@ -297,7 +297,7 @@ $(function() {
 <script>
   $(function() {
     var me = {{ user|json|safe }};
-    var socket = io.connect('{{ baseUrl }}');
+    var socket = io();
     socket.on('page edited', function (data) {
       if (data.user._id != me._id
         && data.page.path == {{ page.path|json|safe }}) {

+ 2 - 2
package.json

@@ -58,8 +58,8 @@
     "nodemailer": "~1.2.2",
     "nodemailer-ses-transport": "~1.1.0",
     "redis": "~0.12.1",
-    "socket.io": "~0.9.16",
-    "socket.io-client": "~0.9.16",
+    "socket.io": "~1.3.0",
+    "socket.io-client": "~1.3.0",
     "swig": "=1.3.2",
     "time": "~0.11.0"
   },