From 1b1c160639dacc5c7207b936410ac8fadde89c3f Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Wed, 21 Mar 2012 18:43:45 -0400
Subject: [PATCH] small cleanups

---
 lib/assets/javascripts/flowerbox.js.coffee | 3 ++-
 lib/flowerbox/runner/node.rb               | 1 -
 lib/flowerbox/runner/selenium.rb           | 3 ---
 lib/flowerbox/server.rb                    | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/assets/javascripts/flowerbox.js.coffee b/lib/assets/javascripts/flowerbox.js.coffee
index ecc8c6e..c42e4a9 100644
--- a/lib/assets/javascripts/flowerbox.js.coffee
+++ b/lib/assets/javascripts/flowerbox.js.coffee
@@ -9,9 +9,10 @@ Flowerbox =
 
   contact: (url, data...) ->
     Flowerbox.started = true
+    Flowerbox.done = true if url == 'results'
+
     if !Flowerbox.debug
       Flowerbox.socket.send(JSON.stringify([ url, data ]))
-      Flowerbox.done = true if url == 'results'
 
   started: false
   done: false
diff --git a/lib/flowerbox/runner/node.rb b/lib/flowerbox/runner/node.rb
index e83206b..a1b317b 100644
--- a/lib/flowerbox/runner/node.rb
+++ b/lib/flowerbox/runner/node.rb
@@ -93,7 +93,6 @@ jsdom.env(
           }
 
           if (!gotFlowerbox && context.Flowerbox) {
-            context.Flowerbox.baseUrl = "http://localhost:#{server.port}/";
             context.Flowerbox.environment = 'node';
             context.Flowerbox.UNKNOWN = '#{Flowerbox::Result::FileInfo::UNKNOWN}';
 
diff --git a/lib/flowerbox/runner/selenium.rb b/lib/flowerbox/runner/selenium.rb
index 116d867..d106e4b 100644
--- a/lib/flowerbox/runner/selenium.rb
+++ b/lib/flowerbox/runner/selenium.rb
@@ -62,9 +62,6 @@ console.log = function(msg) {
     #{template_files.join("\n")}
     <script type="text/javascript">
       Flowerbox.environment = '#{name}';
-      Flowerbox.onQueueStateChange = function(msg) {
-        //document.getElementById('queue').innerHTML = document.getElementById('queue').innerHTML + "\\n" + msg;
-      };
       Flowerbox.UNKNOWN = '#{Flowerbox::Result::FileInfo::UNKNOWN}';
 
       var context = this;
diff --git a/lib/flowerbox/server.rb b/lib/flowerbox/server.rb
index 51129f1..24dd4bb 100644
--- a/lib/flowerbox/server.rb
+++ b/lib/flowerbox/server.rb
@@ -64,7 +64,6 @@ module Flowerbox
             }
           end
 
-
           ::Rack::Handler::Thin.run(rack_app, server_options) do |server|
             Thread.current[:server] = server