Revert "update-sockjs: Update sockjs from version 0.3.4 to 1.1.1."

This reverts commit 7bf10ec74f.

Apparently, SockJS 1.1.1 is broken with the browser used in our legacy
desktop app, resulting in messages being silently not sent.

docs/THIRDPARTY

@@ -174,6 +174,11 @@ Files: static/third/string-prototype-codepointat/*
 Copyright: 2014 Mathias Bynens
 License: Expat
 
+Files: static/third/sockjs/sockjs-0.3.4.js
+Copyright: 2011-2012 VMware, Inc.
+ 2012 Douglas Crockford
+License: Expat and public-domain
+
 Files: static/third/sorttable/sorttable.js
 Copyright: 2007 Stuart Langridge
 License: X11

package.json

@@ -5,7 +5,6 @@
   "description": "",
   "main": "",
   "dependencies": {
-    "browserify": "13.1.1",
     "handlebars": "1.3.0",
     "i18next": "3.0.0",
     "i18next-parser": "0.11.1",
@@ -15,7 +14,6 @@
     "jquery": "1.12.1",
     "jquery-validation": "1.15.1",
     "plotly.js": "1.19.2",
-    "sockjs-client":"1.1.1",
     "webpack": "1.12.2",
     "zxcvbn": "4.4.1"
   },
@@ -32,7 +30,6 @@
     "xmlhttprequest": "1.5.0"
   },
   "scripts": {
-    "postinstall": "browserify node_modules/sockjs-client/lib/entry.js --standalone SockJS > node_modules/sockjs-client/sockjs.js",
     "lint": "eslint --quiet",
     "lint-loud": "eslint static/js frontend_tests"
   },

static/js/socket.js

@@ -55,7 +55,7 @@ function Socket(url) {
 
 Socket.prototype = {
     _create_sockjs_object: function Socket__create_sockjs_object() {
-        this._sockjs = new SockJS(this.url, null, {transports: this._supported_protocols});
+        this._sockjs = new SockJS(this.url, null, {protocols_whitelist: this._supported_protocols});
         this._setup_sockjs_callbacks(this._sockjs);
     },
 

zerver/tornado/socket.py

@@ -304,7 +304,7 @@ def respond_send_message(data):
 # securely send us the zulip.com cookie, which we use as part of our
 # authentication scheme.
 sockjs_router = sockjs.tornado.SockJSRouter(SocketConnection, "/sockjs",
-                                            {'sockjs_url': 'https://%s/node_modules/sockjs-client/sockjs.js' % (
+                                            {'sockjs_url': 'https://%s/static/third/sockjs/sockjs-0.3.4.js' % (
                                                                 settings.EXTERNAL_HOST,),
                                              'disabled_transports': ['eventsource', 'htmlfile']})
 def get_sockjs_router():

zproject/settings.py

@@ -724,6 +724,7 @@ PIPELINE = {
     },
     'JAVASCRIPT': {},
 }
+
 JS_SPECS = {
     'common': {
         'source_filenames': (
@@ -755,7 +756,6 @@ JS_SPECS = {
             'third/bootstrap-notify/js/bootstrap-notify.js',
             'third/html5-formdata/formdata.js',
             'node_modules/jquery-validation/dist/jquery.validate.js',
-            'node_modules/sockjs-client/sockjs.js',
             'third/jquery-form/jquery.form.js',
             'third/jquery-filedrop/jquery.filedrop.js',
             'third/jquery-caret/jquery.caret.1.5.2.js',
@@ -769,6 +769,7 @@ JS_SPECS = {
             'third/spectrum/spectrum.js',
             'third/string-prototype-codepointat/codepointat.js',
             'third/winchan/winchan.js',
+            'third/sockjs/sockjs-0.3.4.js',
             'third/handlebars/handlebars.runtime.js',
             'third/marked/lib/marked.js',
             'templates/compiled.js',
@@ -865,8 +866,8 @@ JS_SPECS = {
     },
     # We also want to minify sockjs separately for the sockjs iframe transport
     'sockjs': {
-        'source_filenames': ('node_modules/sockjs-client/sockjs.js',),
-        'output_filename': 'min/sockjs.min.js'
+        'source_filenames': ('third/sockjs/sockjs-0.3.4.js',),
+        'output_filename': 'min/sockjs-0.3.4.min.js'
     },
 }