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

Merge pull request #14099 from pandamicro/v3 

[ci skip]Sync with CCBoot for web
This commit is contained in:
pandamicro 2015-10-10 10:16:16 +08:00
parent bf35655ce3 5ae2812bf8
commit 8b0a6a6c29
4 changed files with 549 additions and 474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1006
cocos/scripting/js-bindings/script/jsb_boot.js
View File

File diff suppressed because it is too large Load Diff

13
cocos/scripting/js-bindings/script/jsb_prepare.js
View File

@ -22,8 +22,19 @@
// Prepare JSB environment
var cc = cc || {};
var window = window || this;
var cc = cc || {};
/**
* @namespace jsb
* @name jsb
*/
var jsb = jsb || {};
/**
* The element contains the game canvas
* @type {HTMLDivElement}
*/
cc.container = null;
/**
* Iterate over an object or an array, executing a function for each matched element.

2
tests/js-tests/src/tests-main.js
View File

@ -138,7 +138,7 @@ var TestController = cc.LayerGradient.extend({
// enable disable
if ( !cc.sys.isNative) {
if( 'opengl' in cc.sys.capabilities ){
if( cc._renderType !== cc.game.RENDER_TYPE_CANVAS ){
menuItem.enabled = (testNames[i].platforms & PLATFORM_HTML5) | (testNames[i].platforms & PLATFORM_HTML5_WEBGL);
}else{
menuItem.setEnabled( testNames[i].platforms & PLATFORM_HTML5 );

2
web

@ -1 +1 @@
Subproject commit 8085df89a73b18a08a7747064a894c9a8dc803c1
Subproject commit a9f493ae53d20945d8796660363da4e060a68ee2