From baf152ea9458c923a714bc15b61102ece35dd5cf Mon Sep 17 00:00:00 2001 From: Diego Casorran Date: Wed, 5 Dec 2018 20:04:42 +0000 Subject: [PATCH 1/2] Prevent TypeError: Document not active - fixes #34 --- jquery.fullscreen.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/jquery.fullscreen.js b/jquery.fullscreen.js index a9ada18..62f0ce8 100644 --- a/jquery.fullscreen.js +++ b/jquery.fullscreen.js @@ -61,10 +61,7 @@ function fullScreen(state) } // Check fullscreen state - state = !!doc["fullscreenElement"] - || !!doc["msFullscreenElement"] - || !!doc["webkitIsFullScreen"] - || !!doc["mozFullScreen"]; + state = fullScreenState(doc); if (!state) return state; // Return current fullscreen element or "true" if browser doesn't @@ -100,11 +97,21 @@ function fullScreen(state) || (/** @type {?Function} */ doc["webkitCancelFullScreen"]) || (/** @type {?Function} */ doc["msExitFullscreen"]) || (/** @type {?Function} */ doc["mozCancelFullScreen"]); - if (func) func.call(doc); + if (func && fullScreenState(doc)) func.call(doc); return this; } } +/** + * Check fullscreen state + * + * @param {Document} doc The content document + * @return {Boolean} + */ +function fullScreenState(doc) { + return !!(doc["fullscreenElement"] || doc["msFullscreenElement"] || doc["webkitIsFullScreen"] || doc["mozFullScreen"]); +} + /** * Toggles the fullscreen mode. * From ea8adcbdbc1485855444bcdb80a5420e1d8225eb Mon Sep 17 00:00:00 2001 From: Diego Casorran Date: Wed, 5 Dec 2018 20:08:36 +0000 Subject: [PATCH 2/2] Bump version. --- jquery.fullscreen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.fullscreen.js b/jquery.fullscreen.js index 62f0ce8..07b9cb1 100644 --- a/jquery.fullscreen.js +++ b/jquery.fullscreen.js @@ -1,5 +1,5 @@ /** - * @preserve jquery.fullscreen 1.1.5 + * @preserve jquery.fullscreen 1.1.6 * https://github.com/kayahr/jquery-fullscreen-plugin * Copyright (C) 2012-2013 Klaus Reimer * Licensed under the MIT license