Merge pull request #7 from liquiddc/master

Pull liquiddc changes in to IE branch

Author: Floppy

dashing.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dashing'
-  s.version     = '1.3.2'
+  s.version     = '1.3.x'
   s.date        = '2013-11-21'
   s.executables << 'dashing'
 

javascripts/dashing.coffee

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

lib/dashing/app.rb

@@ -67,8 +67,19 @@ def protected!
 get '/events', provides: 'text/event-stream' do
   protected!
   response.headers['X-Accel-Buffering'] = 'no' # Disable buffering for nginx
+  response.headers['Access-Control-Allow-Origin'] = '*' # For Yaffle eventsource polyfill
+  response.headers['Cache-Control'] = 'no-cache' # For Yaffle eventsource polyfill
+  
   stream :keep_open do |out|
     settings.connections << out
+  
+    # For Yaffle eventsource polyfill
+    #Add 2k padding for IE
+    str = ":".ljust(2049) << "\n"
+    #add retry key
+    str << "retry: 2000\n"
+    out << str
+    
     out << latest_events
     out.callback { settings.connections.delete(out) }
   end

templates/project/assets/javascripts/application.coffee

@@ -1,11 +1,15 @@
+# make sure Yaffle's eventsource goes in first
+#= require eventsource.js
+
+
 # dashing.js is located in the dashing framework
 # It includes jquery & batman for you.
 #= require dashing.js
 
 #= 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]