[Pkg-javascript-commits] [sockjs-client] 133/434: Share options with the chunking test - for example 'devel' option affects iframe url (in opera).

Tonnerre Lombard tonnerre-guest at moszumanska.debian.org
Wed Jan 8 00:47:09 UTC 2014


This is an automated email from the git hooks/post-receive script.

tonnerre-guest pushed a commit to branch master
in repository sockjs-client.

commit 028f084fa73f7188c383edb18c87871028e90374
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Wed Sep 7 15:16:31 2011 +0100

    Share options with the chunking test - for example 'devel' option affects iframe url (in opera).
---
 lib/chunking-test.js | 4 ++--
 lib/sockjs.js        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/chunking-test.js b/lib/chunking-test.js
index 11446ea..60ca84f 100644
--- a/lib/chunking-test.js
+++ b/lib/chunking-test.js
@@ -26,7 +26,7 @@ var ChunkingTestIframe = FacadeJS['w-iframe-chunking-test'] = function (ri, tran
 };
 ChunkingTestIframe.prototype.doCleanup = function() {};
 
-var chunkingTestUncached = SockJS.chunkingTest = function(base_url, callback) {
+var chunkingTestUncached = SockJS.chunkingTest = function(base_url, callback, options) {
     base_url = utils.amendUrl(base_url);
     // 1. CORS
     if (_window.XDomainRequest ||
@@ -46,7 +46,7 @@ var chunkingTestUncached = SockJS.chunkingTest = function(base_url, callback) {
             }
         };
         var mock_ri = {
-            _options: {},
+            _options: options || {},
             _didClose: fun,
             _didMessage: fun
         };
diff --git a/lib/sockjs.js b/lib/sockjs.js
index 77be024..bd88a14 100644
--- a/lib/sockjs.js
+++ b/lib/sockjs.js
@@ -153,7 +153,7 @@ SockJS.prototype._try_next_protocol = function(close_event) {
             chunkingTest(that._base_url, function(chunking) {
                              that._options.chunking = chunking;
                              that._try_next_protocol();
-                         });
+                         }, that._options);
             return true;
         }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/sockjs-client.git



More information about the Pkg-javascript-commits mailing list