Skip to content

Commit efd766e

Browse files
committed
Merge #35 - Prevent TypeError: Document not active
Pull-request: #35 Fixes: #34
2 parents 24d23c0 + ea8adcb commit efd766e

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

jquery.fullscreen.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @preserve jquery.fullscreen 1.1.5
2+
* @preserve jquery.fullscreen 1.1.6
33
* https://github.com/kayahr/jquery-fullscreen-plugin
44
* Copyright (C) 2012-2013 Klaus Reimer <[email protected]>
55
* Licensed under the MIT license
@@ -61,10 +61,7 @@ function fullScreen(state)
6161
}
6262

6363
// Check fullscreen state
64-
state = !!doc["fullscreenElement"]
65-
|| !!doc["msFullscreenElement"]
66-
|| !!doc["webkitIsFullScreen"]
67-
|| !!doc["mozFullScreen"];
64+
state = fullScreenState(doc);
6865
if (!state) return state;
6966

7067
// Return current fullscreen element or "true" if browser doesn't
@@ -100,11 +97,21 @@ function fullScreen(state)
10097
|| (/** @type {?Function} */ doc["webkitCancelFullScreen"])
10198
|| (/** @type {?Function} */ doc["msExitFullscreen"])
10299
|| (/** @type {?Function} */ doc["mozCancelFullScreen"]);
103-
if (func) func.call(doc);
100+
if (func && fullScreenState(doc)) func.call(doc);
104101
return this;
105102
}
106103
}
107104

105+
/**
106+
* Check fullscreen state
107+
*
108+
* @param {Document} doc The content document
109+
* @return {Boolean}
110+
*/
111+
function fullScreenState(doc) {
112+
return !!(doc["fullscreenElement"] || doc["msFullscreenElement"] || doc["webkitIsFullScreen"] || doc["mozFullScreen"]);
113+
}
114+
108115
/**
109116
* Toggles the fullscreen mode.
110117
*

0 commit comments

Comments
 (0)