From 77724d3c856a79031c8ecd17a8c284e773c64072 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 12 Apr 2017 11:41:39 +0800 Subject: [PATCH] [ci skip]Fix JS test issues reported from QA (#17691) * Fix websocket sendbinary issue * Fix web issues reported from QA --- tests/js-tests/src/ExtensionsTest/NetworkTest/WebSocketTest.js | 2 +- web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/js-tests/src/ExtensionsTest/NetworkTest/WebSocketTest.js b/tests/js-tests/src/ExtensionsTest/NetworkTest/WebSocketTest.js index 4fb975cc0c..81491eaa6f 100644 --- a/tests/js-tests/src/ExtensionsTest/NetworkTest/WebSocketTest.js +++ b/tests/js-tests/src/ExtensionsTest/NetworkTest/WebSocketTest.js @@ -135,7 +135,7 @@ var WebSocketTestLayer = cc.Layer.extend({ }; - this._wsiSendBinary = new WebSocket("ws://echo.websocket.org", ["protocol3"]); + this._wsiSendBinary = new WebSocket("ws://echo.websocket.org"); this._wsiSendBinary.binaryType = "arraybuffer"; this._wsiSendBinary.onopen = function(evt) { self._sendBinaryStatus.setString("Opened, url: " + self._wsiSendBinary.url + ", protocol: " + self._wsiSendBinary.protocol); diff --git a/web b/web index 003dfae46b..353c5b5b5b 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 003dfae46b18ba2c4b8913408dbbc8c37cdc4372 +Subproject commit 353c5b5b5be72e3959bc323a03878ca3d0d86430