From 9b08ca9005cbfc392b405e984f0dfc0a5d66ec52 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Sat, 18 Jul 2015 12:59:20 -0700 Subject: [PATCH] vidrw: ensure iframe replacement does get rewritten! regex rewrite: include '==top?' for wombat rewrite rewrite css: if js_ modifier on text/css, treat as css --- pywb/rewrite/regex_rewriters.py | 2 +- pywb/rewrite/rewrite_content.py | 3 +++ pywb/static/vidrw.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pywb/rewrite/regex_rewriters.py b/pywb/rewrite/regex_rewriters.py index ea7b122e..7dee0bde 100644 --- a/pywb/rewrite/regex_rewriters.py +++ b/pywb/rewrite/regex_rewriters.py @@ -139,7 +139,7 @@ class JSLocationRewriterMixin(object): # (r'(?<=document\.)cookie', RegexRewriter.add_prefix(prefix), 0), #todo: move to mixin? - (r'(?<=[\s=(){])(top)\s*(?:[!})]|==|$)', + (r'(?<=[\s=(){])(top)\s*(?:[!}?)]|==|$)', RegexRewriter.add_prefix(prefix), 1), (r'^(top)\s*(?:[!})]|==|$)', diff --git a/pywb/rewrite/rewrite_content.py b/pywb/rewrite/rewrite_content.py index 6bb300c4..dc430a90 100644 --- a/pywb/rewrite/rewrite_content.py +++ b/pywb/rewrite/rewrite_content.py @@ -218,6 +218,9 @@ class RewriteContent: @staticmethod def _resolve_text_type(mod, text_type, stream): + if text_type == 'css' and mod == 'js': + return 'css', stream + # only attempt to resolve between html and other text types if text_type != 'html': return mod, stream diff --git a/pywb/static/vidrw.js b/pywb/static/vidrw.js index f72cde31..95c464f6 100644 --- a/pywb/static/vidrw.js +++ b/pywb/static/vidrw.js @@ -352,7 +352,7 @@ __wbvidrw = (function() { } function do_replace_iframe(elem, url) { - var iframe = document.createElement("iframe", true); + var iframe = document.createElement("iframe"); var dim = get_dim(elem); iframe.width = dim[0]; iframe.height = dim[1];