From 16e3e92c4a1d22ceb9ef5ba90d13dbb20fe77850 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Sat, 20 Oct 2012 16:14:56 +0100 Subject: [PATCH] Fullscreen icon now changing on event handler No longer detecting current image src and showing the opposite icon on click We're now changing the icon on screen change event handler --- lib/ice-coder.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/ice-coder.js b/lib/ice-coder.js index 4459428..e47a930 100644 --- a/lib/ice-coder.js +++ b/lib/ice-coder.js @@ -47,6 +47,8 @@ var ICEcoder = { // On load, set the layout and get the nest location init: function() { + var screenIcon, sISrc; + // Set layout & the nest location ICEcoder.setLayout(); @@ -64,6 +66,14 @@ var ICEcoder = { tab.addEventListener('dragend', ICEcoder.handleDragEnd, false); }); setInterval(ICEcoder.updateNestingIndicator,30); + + // Setup fullscreen detection and change icon + screenIcon = top.document.getElementById('screenMode'); + sISrc = ["images/restored-screen.gif","images/full-screen.gif"]; + document.addEventListener("fullscreenchange", function () {screenIcon.src = document.fullscreen ? sISrc[0] : sISrc[1];}, false); + document.addEventListener("mozfullscreenchange", function () {screenIcon.src = document.mozFullScreen ? sISrc[0] : sISrc[1];}, false); + document.addEventListener("webkitfullscreenchange", function () {screenIcon.src = document.webkitIsFullScreen ? sISrc[0] : sISrc[1];}, false); + top.ICEcoder.ready = true; }, @@ -1307,10 +1317,6 @@ var ICEcoder = { // Toggle full screen on/off fullScreenSwitcher: function() { - var screenIcon; - - screenIcon = top.document.getElementById('screenMode'); - // Future use if ("undefined" != typeof document.cancelFullScreen) { document.fullScreen ? document.cancelFullScreen() : document.body.requestFullScreen(); @@ -1321,8 +1327,6 @@ var ICEcoder = { } else if ("undefined" != typeof document.webkitCancelFullScreen) { document.webkitIsFullScreen ? document.webkitCancelFullScreen() : document.body.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT); } - - screenIcon.src = screenIcon.src.indexOf("images/full-screen.gif") > -1 ? "images/restored-screen.gif" : "images/full-screen.gif"; }, // Pass target file/folder to Zip It!