summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 10:47:21 +0000
committerkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 10:47:21 +0000
commitaa5f888a50689569f458c096fa63dba7a9d24a97 (patch)
treeacca222cff4071a50f7e4fe11e4fa59131206cff
parent2070ecca5d5b46264ca37f3a9ee260baf65712ea (diff)
downloadchromium_src-aa5f888a50689569f458c096fa63dba7a9d24a97.zip
chromium_src-aa5f888a50689569f458c096fa63dba7a9d24a97.tar.gz
chromium_src-aa5f888a50689569f458c096fa63dba7a9d24a97.tar.bz2
Exit full screen on Escape in Chrome OS media player.
While at it, also implemented play/pause on spacebar. BUG=chromium-os:2958 TEST=Manual test Review URL: http://codereview.chromium.org/6880273 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83501 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/mediaplayer.html19
1 files changed, 19 insertions, 0 deletions
diff --git a/chrome/browser/resources/mediaplayer.html b/chrome/browser/resources/mediaplayer.html
index f9ce076..4cbeb276 100644
--- a/chrome/browser/resources/mediaplayer.html
+++ b/chrome/browser/resources/mediaplayer.html
@@ -287,6 +287,7 @@ var currentItem = -1;
var savedVolumeValue = 0;
var hideVolumeTimerId = 0;
var localStrings;
+var fullScreen = false;
///////////////////////////////////////////////////////////////////////////////
// Document Functions:
@@ -300,6 +301,8 @@ function load() {
document.body.addEventListener('drop', function(e) {
if (e.preventDefault) e.preventDefault();
});
+ document.body.addEventListener('keydown', onkeydown);
+
localStrings = new LocalStrings();
chrome.send('getCurrentPlaylist', []);
}
@@ -645,7 +648,23 @@ function playAudioFile(uri) {
}
}
+function onkeydown(event) {
+ const ESCAPE_KEY_CODE = 27;
+ const SPACE_KEY_CODE = 32;
+ switch (event.keyCode) {
+ case ESCAPE_KEY_CODE:
+ if (fullScreen)
+ toggleFullscreen();
+ break;
+
+ case SPACE_KEY_CODE:
+ playPauseButtonClick();
+ break;
+ }
+}
+
function toggleFullscreen() {
+ fullScreen = !fullScreen;
chrome.send('toggleFullscreen', ['']);
}