Merge pull request fabiocaseri#1 from arabold/feature/IE-compatibility

Feature/ie compatibility
kakaruto · Apr 10, 2015 · c06eeca · c06eeca
2 parents afc0f2e + 67f493d
commit c06eeca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/javascripts/dashing.coffee b/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")

diff --git a/lib/dashing.js b/lib/dashing.js
@@ -102,7 +102,8 @@ module.exports.Dashing = function Dashing() {
       '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

diff --git a/templates/project/assets/javascripts/application.coffee b/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]

diff --git a/templates/project/dashboards/layout.jade b/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