Просмотр исходного кода

impl live-reload(node and html only)

Yuki Takei 9 лет назад
Родитель
Сommit
0f880161d5
3 измененных файлов с 12 добавлено и 12 удалено
  1. 10 10
      lib/crowi/index.js
  2. 1 1
      lib/views/layout/layout.html
  3. 1 1
      resource/js/legacy/crowi.js

+ 10 - 10
lib/crowi/index.js

@@ -300,16 +300,16 @@ Crowi.prototype.start = function() {
 
       // reload settings
       // see: https://github.com/jprichardson/reload
-      // if (self.node_env === 'development') {
-      //   const reloadServer = reload(server, app);
-      //   // fire reload() when html is modified
-      //   const watcher = chokidar.watch(path.join(self.libDir, 'views'));
-      //   watcher.on('all', (event, path) => {
-      //     reloadServer.reload();
-      //   });
-
-      //   debug(`watching for live-reloading -> ${self.libDir}`);
-      // }
+      if (self.node_env === 'development') {
+        const reloadServer = reload(server, app);
+        // fire reload() when html is modified
+        const watcher = chokidar.watch(path.join(self.libDir, 'views'));
+        watcher.on('all', (event, path) => {
+          reloadServer.reload();
+        });
+
+        debug(`watching for live-reloading -> ${self.libDir}`);
+      }
 
       io = require('socket.io')(server);
       io.sockets.on('connection', function (socket) {

+ 1 - 1
lib/views/layout/layout.html

@@ -24,7 +24,7 @@
 
   {% if env === 'development' %}
     <script src="{{ webpack_asset('style').js }}"></script>
-    <!--<script src="{{ webpack_asset('dev').js }}" async></script>-->
+    <script src="{{ webpack_asset('dev').js }}" async></script>
     <script src="/js/dll/vendor.dll.js" defer></script>
   {% endif %}
 

+ 1 - 1
resource/js/legacy/crowi.js

@@ -740,7 +740,7 @@ $(function() {
 
     //
     var me = $('body').data('me');
-    var socket = io();
+    var socket = io('localhost', {forceNew: true});
     socket.on('page edited', function (data) {
       if (data.user._id != me
         && data.page.path == pagePath) {