Skip to content

Fixed #3841: Use event on cc.canvas to make full screen request #1518

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 7 commits into from
Jan 25, 2014
Merged

Fixed #3841: Use event on cc.canvas to make full screen request #1518

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
617e4fc
issue #3690: Rewrite CCNS.js
SmallAiTT Jan 14, 2014
5aae010
Merge pull request #1485 from SmallAiTT/iss3690_ccns_dev3.0
dingpinglv Jan 14, 2014
508816f
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html…
pandamicro Jan 25, 2014
50e3198
Fixed #3841: Use event on cc.canvas to make full screen request
pandamicro Jan 25, 2014
5a8903a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
pandamicro Jan 25, 2014
f2e2a3f
update Tab
pandamicro Jan 25, 2014
5afc874
Update tab2
pandamicro Jan 25, 2014
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
5 changes: 3 additions & 2 deletions cocos2d/core/platform/CCScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,15 @@ cc.Screen = cc.Class.extend({
*/
autoFullScreen: function (element, onFullScreenChange) {
element = element || document.body;
var touchTarget = cc.canvas || element;
var theScreen = this;
// Function bind will be too complicated here because we need the callback function's reference to remove the listener
function callback() {
theScreen.requestFullScreen(element, onFullScreenChange);
element.removeEventListener(theScreen._touchEvent, callback);
touchTarget.removeEventListener(theScreen._touchEvent, callback);
}
this.requestFullScreen(element, onFullScreenChange);
element.addEventListener(this._touchEvent, callback);
touchTarget.addEventListener(this._touchEvent, callback);
}
});

Expand Down