tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2017-01-25 13:46:49 +00:00
commit c8525c026c
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/javascript/LeftAndMain.js
View File

@ -73,7 +73,7 @@ jQuery.noConflict();
$(window).on("message", function(e) { $(window).on("message", function(e) {
var target, var target,
event = e.originalEvent, 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 // Reject messages outside of the same origin
if($.path.parseUrl(window.location.href).domain !== $.path.parseUrl(event.origin).domain) return; if($.path.parseUrl(window.location.href).domain !== $.path.parseUrl(event.origin).domain) return;