diff --git a/pywb/rewrite/html_rewriter.py b/pywb/rewrite/html_rewriter.py index 246c037b..c4ec854c 100644 --- a/pywb/rewrite/html_rewriter.py +++ b/pywb/rewrite/html_rewriter.py @@ -168,10 +168,7 @@ class HTMLRewriterMixin(object): # attr rewriting handler = self.rewrite_tags.get(tag) if not handler: - handler = self.rewrite_tags.get('') - - if not handler: - return False + handler = {} self.out.write('<' + tag) diff --git a/pywb/rewrite/regex_rewriters.py b/pywb/rewrite/regex_rewriters.py index cfc00cbe..0b5bd47a 100644 --- a/pywb/rewrite/regex_rewriters.py +++ b/pywb/rewrite/regex_rewriters.py @@ -136,22 +136,14 @@ class JSLocationRewriterMixin(object): (r'(?<=document\.)cookie', RegexRewriter.add_prefix(prefix), 0), #todo: move to mixin? - (r'(?<=[\s=(){])(parent|top)\s*(?:[!}()]|==|$)', - RegexRewriter.add_prefix(prefix), 1), + (r'(?<=[\s=(){])(top)\s*(?:[!}()]|==|$)', + RegexRewriter.add_prefix(prefix), 1), - (r'^(parent|top)\s*(?:[!}()]|==|$)', - RegexRewriter.add_prefix(prefix), 1), + (r'^(top)\s*(?:[!}()]|==|$)', + RegexRewriter.add_prefix(prefix), 1), - (r'(?<=window\.)(parent|top)', - RegexRewriter.add_prefix(prefix), 1), - - - - # (r'\b(top)\b[!=\W]+(?:self|window)', - # RegexRewriter.add_prefix(prefix), 1), - - #(r'\b(?:self|window)\b[!=\W]+\b(top)\b', - #RegexRewriter.add_prefix(prefix), 1), + (r'(?<=window\.)(top)', + RegexRewriter.add_prefix(prefix), 1), ] super(JSLocationRewriterMixin, self).__init__(rewriter, rules) diff --git a/pywb/rewrite/test/test_html_rewriter.py b/pywb/rewrite/test/test_html_rewriter.py index 7e17e28f..a59a7b13 100644 --- a/pywb/rewrite/test/test_html_rewriter.py +++ b/pywb/rewrite/test/test_html_rewriter.py @@ -8,7 +8,7 @@ ur""" #================================================================= >>> parse('Text') -Text +Text >>> parse('