Fix cross-origin postMessage usage in Chrome Canary

Storm-Eagle20 · Mar 19, 2016 · f74584f · f74584f
1 parent 898debc
commit f74584f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/crossdomain.php b/crossdomain.php
@@ -99,8 +99,8 @@
 var yourOrigin = <?php echo json_encode('http://' . $host) ?>;
 var myOrigin = 'https://play.pokemonshowdown.com';
 
-function postMessage (message) {
-	if (window.parent.postMessage === postMessage) return;
+function postReply (message) {
+	if (window.parent.postMessage === postReply) return;
 	return window.parent.postMessage(message, yourOrigin);
 }
 function messageHandler(e) {
@@ -132,7 +132,7 @@ function messageHandler(e) {
 			url: rq[0],
 			data: rq[1],
 			success: function(ajaxdata) {
-				postMessage('r' + JSON.stringify([rq[2], ajaxdata]));
+				postReply('r' + JSON.stringify([rq[2], ajaxdata]));
 			},
 			dataType: rq[3]
 		});
@@ -141,21 +141,21 @@ function messageHandler(e) {
 }
 
 window.addEventListener('message', messageHandler);
-if (config.host !== 'showdown') postMessage('c' + config);
+if (config.host !== 'showdown') postReply('c' + config);
 var storageAvailable = false;
 try {
 	var testVal = '' + Date.now();
 	localStorage.setItem('showdown_allow3p', testVal);
 	if (localStorage.getItem('showdown_allow3p') === testVal) {
-		postMessage('a1');
-		postMessage('p' + localStorage.getItem('showdown_prefs'));
-		postMessage('t' + localStorage.getItem('showdown_teams'));
+		postReply('a1');
+		postReply('p' + localStorage.getItem('showdown_prefs'));
+		postReply('t' + localStorage.getItem('showdown_teams'));
 		storageAvailable = true;
 	}
 } catch (err) {}
 
 if (!storageAvailable) {
-	postMessage('a0');
+	postReply('a0');
 }
 
 if (location.protocol + '//' + location.hostname !== myOrigin) {

diff --git a/crossprotocol.html b/crossprotocol.html
@@ -6,7 +6,7 @@
 var yourOrigin = 'http://play.pokemonshowdown.com';
 var myOrigin = 'https://play.pokemonshowdown.com';
 
-function postMessage(message) {
+function postReply(message) {
 	return window.parent.postMessage(message, yourOrigin);
 }
 function messageHandler(e) {
@@ -37,7 +37,7 @@
 			rq[0],
 			rq[1],
 			function(ajaxdata) {
-				postMessage('r' + JSON.stringify([rq[2], ajaxdata]));
+				postReply('r' + JSON.stringify([rq[2], ajaxdata]));
 			},
 			rq[3]
 		);
@@ -51,15 +51,15 @@
 	var testVal = '' + Date.now();
 	localStorage.setItem('showdown_allow3p', testVal);
 	if (localStorage.getItem('showdown_allow3p') === testVal) {
-		postMessage('a1');
-		postMessage('p' + localStorage.getItem('showdown_prefs'));
-		postMessage('t' + localStorage.getItem('showdown_teams'));
+		postReply('a1');
+		postReply('p' + localStorage.getItem('showdown_prefs'));
+		postReply('t' + localStorage.getItem('showdown_teams'));
 		storageAvailable = true;
 	}
 } catch (err) {}
 
 if (!storageAvailable) {
-	postMessage('a0');
+	postReply('a0');
 }
 
 if (location.protocol + '//' + location.hostname !== myOrigin) {