backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

rewrite: more nuanced 'top' rewriting, fix wombat frame mode detection

Browse Source
This commit is contained in:
Ilya Kreymer 2014-04-26 18:43:25 -07:00
parent 58f261fda4
commit 09653cf77e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pywb/rewrite/regex_rewriters.py
View File

@ -127,8 +127,10 @@ class JSLinkAndLocationRewriter(JSLinkOnlyRewriter):
(r'(?<!/)\blocation\b', RegexRewriter.add_prefix(prefix), 0),
(r'(?<=document\.)domain', RegexRewriter.add_prefix(prefix), 0),
(r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0),
(r'(?<!/)\btop\b', RegexRewriter.add_prefix(prefix), 0),
#(r'(?<=window\.)top', RegexRewriter.add_prefix(prefix), 0),
(r'(?<=window\.)top', RegexRewriter.add_prefix(prefix), 0),
(r'\b(top)\b[!=\W]+(?:self|window)', RegexRewriter.add_prefix(prefix), 1),
(r'(?:self|window)[!=\W]+\b(top)\b', RegexRewriter.add_prefix(prefix), 1),
]
#import sys
#sys.stderr.write('\n\n*** RULES:' + str(rules) + '\n\n')

2
pywb/static/wombat.js
View File

@ -553,7 +553,7 @@ WB_wombat_init = (function() {
setInterval(check_all_locations, 500);
}
var is_framed = (window.top.update_wb_url != undefined);
var is_framed = (window.top.wbinfo && window.top.wbinfo.is_frame);
if (window.self.location != window.top.location) {
if (is_framed) {