From 148651680a109ed02f6984192d24fd4583376631 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Tue, 10 Feb 2015 15:02:08 -0800 Subject: [PATCH] wombat fix: use __orig_parent when referencing top-frame, since window.parent is being overriden --- pywb/static/wb.js | 10 ++++++---- pywb/static/wombat.js | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pywb/static/wb.js b/pywb/static/wb.js index a2d31ef2..d67e50c9 100644 --- a/pywb/static/wb.js +++ b/pywb/static/wb.js @@ -107,7 +107,7 @@ function remove_event(name, func, object) { } function notify_top() { - if (window.parent != window.top) { + if (window.__orig_parent != window.top) { return; } @@ -119,9 +119,11 @@ function notify_top() { return; } - window.parent.update_wb_url(window.WB_wombat_location.href, - wbinfo.timestamp, - wbinfo.is_live); + if (window.__orig_parent && window.__orig_parent.update_wb_url) { + window.__orig_parent.update_wb_url(window.WB_wombat_location.href, + wbinfo.timestamp, + wbinfo.is_live); + } remove_event("readystatechange", notify_top, document); } diff --git a/pywb/static/wombat.js b/pywb/static/wombat.js index 07fe6a4d..ced79c6d 100644 --- a/pywb/static/wombat.js +++ b/pywb/static/wombat.js @@ -975,6 +975,7 @@ _WBWombat = (function() { } if (window.self.location != window.top.location) { + window.__orig_parent = window.parent; if (is_framed) { window.top.WB_wombat_location = window.WB_wombat_location;