Merge 49c694b into 7467c4e

ckeditor · Jul 5, 2018 · fec0f4c · fec0f4c
2 parents 7467c4e + 49c694b
commit fec0f4c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/dom/iswindow.js b/src/dom/iswindow.js
@@ -14,5 +14,13 @@
  * @returns {Boolean}
  */
 export default function isWindow( obj ) {
-	return Object.prototype.toString.apply( obj ) == '[object Window]';
+	const stringifiedObject = Object.prototype.toString.apply( obj );
+
+	return (
+		// Returns `true` for the `window` object in browser environments.
+		stringifiedObject == '[object Window]' ||
+
+		// Returns `true` for the `window` object in the Electron environment.
+		stringifiedObject == '[object global]'
+	);
 }
diff --git a/tests/dom/iswindow.js b/tests/dom/iswindow.js
@@ -8,12 +8,22 @@
 import isWindow from '../../src/dom/iswindow';
 
 describe( 'isWindow()', () => {
-	it( 'detects DOM Window', () => {
+	it( 'detects DOM Window in browsers', () => {
 		expect( isWindow( window ) ).to.be.true;
 		expect( isWindow( {} ) ).to.be.false;
 		expect( isWindow( null ) ).to.be.false;
 		expect( isWindow( undefined ) ).to.be.false;
 		expect( isWindow( new Date() ) ).to.be.false;
 		expect( isWindow( 42 ) ).to.be.false;
 	} );
+
+	it( 'detects DOM Window in the Electron environment', () => {
+		const global = {
+			get [ Symbol.toStringTag ]() {
+				return 'global';
+			}
+		};
+
+		expect( isWindow( global ) ).to.be.true;
+	} );
 } );