Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ci skip]Fix JS test issues reported from QA (#17691) 

* Fix websocket sendbinary issue

* Fix web issues reported from QA
This commit is contained in:
pandamicro 2017-04-12 11:41:39 +08:00 committed by minggo
parent 9c9fd875a4
commit 77724d3c85
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/js-tests/src/ExtensionsTest/NetworkTest/WebSocketTest.js
View File

@ -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.binaryType = "arraybuffer";
this._wsiSendBinary.onopen = function(evt) { this._wsiSendBinary.onopen = function(evt) {
self._sendBinaryStatus.setString("Opened, url: " + self._wsiSendBinary.url + ", protocol: " + self._wsiSendBinary.protocol); self._sendBinaryStatus.setString("Opened, url: " + self._wsiSendBinary.url + ", protocol: " + self._wsiSendBinary.protocol);

2
web

@ -1 +1 @@
Subproject commit 003dfae46b18ba2c4b8913408dbbc8c37cdc4372 Subproject commit 353c5b5b5be72e3959bc323a03878ca3d0d86430