[Pkg-javascript-commits] [sockjs-client] 190/350: Merge branch 'master' into 1.0

[tonnerre at ancient-solutions.com]

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

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

commit 68b03315c0b475cae547d58e1c8a1dc85ac7ae9f
Merge: 23f657b 3cbe214
Author: Bryce Kahle <bkahle at gmail.com>
Date:   Mon Oct 20 00:53:46 2014 -0400

    Merge branch 'master' into 1.0
    
    Conflicts:
    	.gitignore
    	lib/sockjs.js
    	lib/utils.js
    	tests/html/lib/endtoendtests.js
    	tests/html/lib/unittests.js

 README.md                        |   16 +-
 bower.json                       |   29 +
 dist/sockjs-0.3.4.js             | 2379 ++++++++++++++++++++++++++++++++++++++
 dist/sockjs-0.3.4.min.js         |   27 +
 dist/sockjs.js                   | 2379 ++++++++++++++++++++++++++++++++++++++
 dist/sockjs.min.js               |   27 +
 tests/html/iframe.html           |    2 +-
 tests/html/sockjs-in-head.html   |    2 +-
 tests/html/sockjs-in-parent.html |    2 +-
 9 files changed, 4848 insertions(+), 15 deletions(-)

diff --cc tests/html/sockjs-in-head.html
index 52f35a6,9e798f2..97b7d93
--- a/tests/html/sockjs-in-head.html
+++ b/tests/html/sockjs-in-head.html
@@@ -6,10 -6,10 +6,10 @@@
    <script>
      document.domain = document.domain;
    </script>
 -  <script src="/lib/sockjs.js?no=cache"></script>
 +  <script src="/__zuul/test-bundle.js?no=cache"></script>
    <script>
      c = parent._sockjs_global;
-     window_id = document.location.hash.slice(1);
+     window_id = window.location.hash.slice(1);
      hook = c(window_id);
      hook.callback = function(code) {eval(code);};
      hook.open();

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