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

[ci skip] update web ref and fix test case issues (#18310)

This commit is contained in:
pandamicro 2017-09-22 10:54:53 +08:00 committed by minggo
parent f94fee793c
commit 247921c08a
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/tests_resources.js
View File

@ -6,7 +6,7 @@ var ccbjs = "";
// so the respath will modify to res,
if (!cc.sys.isNative)
{
if (cc.game.config[cc.game.CONFIG_KEY.engineDir] !== "frameworks/cocos2d-html5") {
if (cc.game.config && cc.game.config[cc.game.CONFIG_KEY.engineDir] !== "frameworks/cocos2d-html5") {
ccbjs = "../../js-tests/resjs/";
}
else

2
web

@ -1 +1 @@
Subproject commit 013e0943bc28952f06bb7abc5ff6d459b2e1e34c
Subproject commit 0d8d51455964330bcd9f4263600bb324eba97f8f