Fixed logic for checking for the existence of a (non-self) parent win…

…dow, see phetsims/tasks#958
phetsims · Nov 19, 2018 · d961dad · d961dad
1 parent e7e5ba8
commit d961dad
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/js/pageload-connector.js b/js/pageload-connector.js
@@ -21,7 +21,7 @@
       if ( data && data.error && data.error.stack ) {
         stack = data.error.stack;
       }
-      window.parent && window.parent.postMessage( JSON.stringify( {
+      ( window.parent !== window.top ) && window.parent.postMessage( JSON.stringify( {
         type: 'pageload-error',
         url: window.location.href,
         message: message,
@@ -35,7 +35,7 @@
     // Wait 4 seconds before reporting load, to see if it errors first
     setTimeout( function() {
       if ( !hasErrored ) {
-        window.parent && window.parent.postMessage( JSON.stringify( {
+        ( window.parent !== window.top ) && window.parent.postMessage( JSON.stringify( {
           type: 'pageload-load',
           url: window.location.href
         } ), '*' );

diff --git a/js/qunit-connector.js b/js/qunit-connector.js
@@ -13,7 +13,7 @@
   QUnit.config.autostart = false;
 
   QUnit.log( function( details ) {
-    window.parent && window.parent.postMessage( JSON.stringify( {
+    ( window.parent !== window.top ) && window.parent.postMessage( JSON.stringify( {
       type: 'qunit-test',
       main: details.module, // TODO: what is this for?
       result: details.result,
@@ -25,7 +25,7 @@
   } );
 
   QUnit.on( 'runEnd', function( data ) {
-    window.parent && window.parent.postMessage( JSON.stringify( {
+    ( window.parent !== window.top ) && window.parent.postMessage( JSON.stringify( {
       type: 'qunit-done',
       failed: data.testCounts.failed,
       passed: data.testCounts.passed,

diff --git a/js/snapshot.js b/js/snapshot.js
@@ -144,7 +144,7 @@ function handleFrame() {
       var hashedURL = hash( url );
       console.log( count, hashedURL );
 
-      window.parent && window.parent.postMessage( JSON.stringify( {
+      ( window.parent !== window.top ) && window.parent.postMessage( JSON.stringify( {
         type: 'screenshot',
         number: count - 1,
         url: url,
@@ -156,7 +156,7 @@ function handleFrame() {
       if ( count === options.numFrames ) {
         var fullHash = hash( screenshotHashes );
 
-        window.parent && window.parent.postMessage( JSON.stringify( {
+        ( window.parent !== window.top ) && window.parent.postMessage( JSON.stringify( {
           type: 'snapshot',
           hash: fullHash,
           url: window.location.href
@@ -179,7 +179,7 @@ window.addEventListener( 'error', function( a ) {
   if ( a && a.error && a.error.stack ) {
     stack = a.error.stack;
   }
-  window.parent && window.parent.postMessage( JSON.stringify( {
+  ( window.parent !== window.top ) && window.parent.postMessage( JSON.stringify( {
     type: 'error',
     message: message,
     stack: stack

diff --git a/js/test-client.js b/js/test-client.js
@@ -17,7 +17,7 @@ window.aqua = {
    * @param {Object} message
    */
   sendMessage: function( message ) {
-    window.parent && window.parent.postMessage( JSON.stringify( message ), '*' );
+    ( window.parent !== window.top ) && window.parent.postMessage( JSON.stringify( message ), '*' );
   },
 
   /**