Merge pull request fabiocaseri#1 from arabold/master

Pulling in some fixes from another fork

javascripts/dashing.coffee

@@ -96,7 +96,8 @@ Dashing.debugMode = false
 
 source = new EventSource('events')
 source.addEventListener 'open', (e) ->
-  console.log("Connection opened")
+  if Dashing.debugMode
+    console.log("Connection opened")
 
 source.addEventListener 'error', (e)->
   console.log("Connection error")

lib/dashing.js

@@ -34,6 +34,7 @@ module.exports.Dashing = function Dashing() {
   dashing.views = dashing.root + '/dashboards';
   dashing.default_dashboard = null;
   dashing.port = (process.env.PORT || 3030);
+  dashing.force_close_event_socket = false;
 
   dashing.protected = function(req, res, next) {
     next();
@@ -86,30 +87,39 @@ module.exports.Dashing = function Dashing() {
     // let request last as long as possible
     req.socket.setTimeout(0);
 
-    var conn = {
-      id: (new Date().getTime().toString() + Math.floor(Math.random() * 1000).toString()),
-      send: function(body) {
-        res.write(body);
-        res.flush(); // need to flush with .compress()
-      }
-    };
-    connections[conn.id] = conn;
+    if (!dashing.force_close_event_socket) {
+      // this won't be necessary if we close the connection after each data package
+      var conn = {
+        id: (new Date().getTime().toString() + Math.floor(Math.random() * 1000).toString()),
+        send: function(body) {
+          res.write(body);
+          res.flush(); // need to flush with .compress()
+        }
+      };
+      connections[conn.id] = conn;
+    }
 
     // send headers for event-stream connection
     res.writeHead(200, {
       'Content-Type': 'text/event-stream',
       'Cache-Control': 'no-cache',
       'Connection': 'keep-alive',
-      'X-Accel-Buffering': 'no' // Disable buffering for nginx
+      'X-Accel-Buffering': 'no', // Disable buffering for nginx
+      'Access-Control-Allow-Origin': '*' //fix XHR issue
     });
     res.write('\n');
     res.write(Array(2049).join(' ') + '\n'); // 2kb padding for IE
     res.write(latest_events());
     res.flush(); // need to flush with .compress()
 
-    req.on('close', function() {
-      delete connections[conn.id];
-    });
+    if (!dashing.force_close_event_socket) {
+	    req.on('close', function() {
+	      delete connections[conn.id];
+	    });
+    }
+    else {
+    	res.end();
+    }
   });
 
   app.get('/', function(req, res) {

templates/project/assets/javascripts/application.coffee

@@ -5,7 +5,7 @@
 #= require_directory .
 #= require_tree ../../widgets
 
-console.log("Yeah! The dashboard has started!")
+#console.log("Yeah! The dashboard has started!")
 
 Dashing.on 'ready', ->
   Dashing.widget_margins ||= [5, 5]

templates/project/dashboards/layout.jade

@@ -4,7 +4,7 @@ html(lang='en')
     meta(charset='utf-8')
     meta(name="description", content='')
     meta(name="viewport", content='width=device-width')
-    meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
+    meta(http-equiv='X-UA-Compatible', content='IE=9,chrome=1')
     title
       block title
         | dashing-js