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

Merge pull request #15609 from pandamicro/v3.11 

Fix web engine issues and SocketIO connection fail issue
This commit is contained in:
minggo 2016-05-11 09:28:24 +08:00
parent 7e37879c52 85812b4f5b
commit 2ad6f10bb6
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/network/WebSocket.cpp
View File

@ -570,13 +570,10 @@ void WebSocket::onSubThreadStarted()
{
"permessage-deflate",
lws_extension_callback_pm_deflate,
// iOS doesn't support client_no_context_takeover extension in the current version, it will cause iOS connection fail
// It may be a bug of lib websocket iOS build
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
// client_no_context_takeover extension is not supported in the current version, it will cause connection fail
// It may be a bug of lib websocket build
// "permessage-deflate; client_no_context_takeover; client_max_window_bits"
"permessage-deflate; client_max_window_bits"
#else
"permessage-deflate; client_no_context_takeover; client_max_window_bits"
#endif
},
{
"deflate-frame",

7
tests/js-tests/src/EventTest/EventTest.js
View File

@ -253,8 +253,11 @@ var TouchAllAtOnce = EventTest.extend({
var touch = touches[i];
var pos = touch.getLocation();
var id = touch.getID();
var force = touch.getCurrentForce();
var maxForce = touch.getMaxForce();
var force = 0, maxForce = 0;
if (touch.getCurrentForce) {
force = touch.getCurrentForce();
maxForce = touch.getMaxForce();
}
cc.log("Touch #" + i + ". onTouchesMoved at: " + pos.x + " " + pos.y + " Id:" + id + " current force:" + force + " maximum postible force:" + maxForce);
target.update_id(id, pos);
}

3
tests/js-tests/src/SceneTest/SceneTest.js
View File

@ -41,7 +41,7 @@ var SceneTestLayer1 = cc.Layer.extend({
var item1 = new cc.MenuItemFont("Test pushScene", this.onPushScene, this);
var item2 = new cc.MenuItemFont("Test pushScene w/transition", this.onPushSceneTran, this);
var item3 = new cc.MenuItemFont("Quit", function () {
cc.log("quit!")
cc.log("quit!");
}, this);
var item4 = new cc.MenuItemFont("setNotificationNode", function () {
var layerTemp = new cc.LayerColor(cc.color(0, 255, 255, 120));
@ -105,6 +105,7 @@ var SceneTestLayer1 = cc.Layer.extend({
},
onExit:function (sender) {
cc.director.setNotificationNode(null);
this._super();
}
//CREATE_NODE(SceneTestLayer1);

2
web

@ -1 +1 @@
Subproject commit d176dc4f74396746445112d030c2fa63875e5bf8
Subproject commit 29e12e52e4d8f47aa5a256967613b353fbbb424d