From c640ade9112c703068754c7d7061d646da7307bd Mon Sep 17 00:00:00 2001 From: Ruud Arentsen Date: Tue, 24 Jan 2017 14:15:34 +0100 Subject: [PATCH] Fixed iframe postmessage breaking non-string messages See issue: https://github.com/silverstripe/silverstripe-framework/issues/6562 This is a fix for that, which was already implemented in the code for version 4.0. --- admin/javascript/LeftAndMain.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 487467118..fa57fe0e8 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -73,7 +73,7 @@ jQuery.noConflict(); $(window).on("message", function(e) { var target, event = e.originalEvent, - data = JSON.parse(event.data); + data = typeof event.data === 'object' ? event.data : JSON.parse(event.data); // Reject messages outside of the same origin if($.path.parseUrl(window.location.href).domain !== $.path.parseUrl(event.origin).domain) return;