Build.

ericz · Jun 21, 2011 · c90bcec · c90bcec
1 parent 3820fa3
commit c90bcec
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/dist/socket.io.js b/dist/socket.io.js
@@ -3335,11 +3335,8 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
    */
 
   function JSONPPolling (socket) {
-    if (!socket) return;
-
     io.Transport['xhr-polling'].apply(this, arguments);
 
-    this.insertAt = document.getElementsByTagName('script')[0];
     this.index = io.j.length;
 
     var self = this;
@@ -3462,7 +3459,8 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
       self.onClose();
     };
 
-    this.insertAt.parentNode.insertBefore(script, this.insertAt);
+    var insertAt = document.getElementsByTagName('script')[0]
+    insertAt.parentNode.insertBefore(script, insertAt);
     this.script = script;
   };
 
@@ -3475,7 +3473,9 @@ var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="Sho
 
   JSONPPolling.prototype._ = function (msg) {
     this.onData(msg);
-    this.get();
+    if (this.open) {
+      this.get();
+    }
     return this;
   };
 

diff --git a/dist/socket.io.min.js b/dist/socket.io.min.js
diff --git a/support/test-runner/app.js b/support/test-runner/app.js
@@ -92,11 +92,7 @@ var io = sio.listen(app);
 io.configure(function () {
   io.set('browser client handler', handler);
   io.set('transports', [
-      'websocket'
-    , 'flashsocket'
-    , 'htmlfile'
-    , 'xhr-polling'
-    , 'jsonp-polling'
+      'jsonp-polling'
   ]);
 });
 
@@ -117,7 +113,13 @@ function suite (name, fn) {
 
 function server (name, fn) {
   currentSuite[name] = port;
-  fn(sio.listen(port));
+
+  var io = sio.listen(port);
+  io.configure(function () {
+    io.set('transports', ['jsonp-polling']);
+  });
+
+  fn(io);
   port++;
 };
 
@@ -141,7 +143,7 @@ suite('socket.test.js', function () {
           clearInterval(interval);
           setTimeout(function () {
             socket.disconnect();
-          }, 300);
+          }, 500);
         }
       }, 50);
     });

diff --git a/support/test-runner/index.jade b/support/test-runner/index.jade
@@ -14,6 +14,10 @@ html
 
     script
       $(function () {
+        run(
+            'socket.test.js'
+        );
+        return;
         run(
             'io.test.js'
           , 'parser.test.js'

diff --git a/support/test-runner/public/stylesheets/main.css b/support/test-runner/public/stylesheets/main.css
@@ -101,6 +101,9 @@ h2 a {
   margin-right: 6px;
   margin-left: 1px;
 }
+.test-list > li ul.cases li.failed {
+  color: #cd3a33;
+}
 .test-list > li.cases ul.cases {
   display: block;
 }

diff --git a/support/test-runner/public/stylesheets/main.styl b/support/test-runner/public/stylesheets/main.styl
@@ -88,6 +88,8 @@ h2
           color #CD3A33
           margin-right 6px
           margin-left 1px
+        &.failed
+          color #CD3A33
   > li.cases
     ul.cases
       display block