Skip to content

Fixed a bug of template that it doesn't work when it doesn't add loading.js #1557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2015
Merged

Fixed a bug of template that it doesn't work when it doesn't add loading.js #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frameworks/cocos2d-html5
Open in desktop
Submodule cocos2d-html5 updated 5 files
+11 −1 AUTHORS.txt
+6 −3 CCBoot.js
+1 −0 cocos2d/core/platform/CCEGLView.js
+2 −2 external/chipmunk/chipmunk.js
+1 −1 template/main.js
2 changes: 1 addition & 1 deletion templates/js-template-default/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/

cc.game.onStart = function(){
if(!cc.sys.isNative) //If referenced loading.js, please remove it
if(!cc.sys.isNative && document.getElementById("cocosLoading")) //If referenced loading.js, please remove it
document.body.removeChild(document.getElementById("cocosLoading"));

cc.view.adjustViewPort(true);
Expand Down