Skip to content

Moved loading.js to res folder for Cocos console release mode. #1558

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 3 commits into from
Mar 18, 2015
Merged

Moved loading.js to res folder for Cocos console release mode. #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79547bb
Moved loading.js to res folder for Cocos console release mode.
dingpinglv Mar 18, 2015
7a570a5
Update the reference of cocos2d-html5
dingpinglv Mar 18, 2015
9392114
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
dingpinglv Mar 18, 2015
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 2 files
+1 −1 template/index.html
+0 −0 template/res/loading.js
2 changes: 1 addition & 1 deletion templates/js-template-default/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</style>
</head>
<body style="padding:0; margin: 0; background: #000;">
<script src="src/loading.js"></script>
<script src="res/loading.js"></script>
<canvas id="gameCanvas" width="800" height="450"></canvas>
<script src="frameworks/cocos2d-html5/CCBoot.js"></script>
<script src="main.js"></script>
Expand Down
0 templates/js-template-default/src/loading.js → templates/js-template-default/res/loading.js
View file
Open in desktop
File renamed without changes.