diff --git a/pywb/rewrite/regex_rewriters.py b/pywb/rewrite/regex_rewriters.py index a9328c51..b27402f4 100644 --- a/pywb/rewrite/regex_rewriters.py +++ b/pywb/rewrite/regex_rewriters.py @@ -128,12 +128,11 @@ class JSLinkAndLocationRewriter(JSLinkOnlyRewriter): (r'(?<=document\.)domain', RegexRewriter.add_prefix(prefix), 0), (r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0), + #todo: move to mixin? (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), + #(r'\b(?:self|window)\b[!=\W]+\b(top)\b', RegexRewriter.add_prefix(prefix), 1), ] - #import sys - #sys.stderr.write('\n\n*** RULES:' + str(rules) + '\n\n') super(JSLinkAndLocationRewriter, self).__init__(rewriter, rules) diff --git a/pywb/webapp/views.py b/pywb/webapp/views.py index abf71494..1724b7dd 100644 --- a/pywb/webapp/views.py +++ b/pywb/webapp/views.py @@ -48,7 +48,14 @@ def format_ts(value, format_='%a, %b %d %Y %H:%M:%S'): @template_filter('host') def get_hostname(url): - return urlparse.urlsplit(url).netloc + split = urlparse.urlsplit(url) + return split.netloc + + +@template_filter('urlsplit') +def get_urlsplit(url): + split = urlparse.urlsplit(url) + return split @template_filter()