mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-24 06:59:52 +01:00
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
This commit is contained in:
parent
a7e1d310dc
commit
9b08ca9005
@ -139,7 +139,7 @@ class JSLocationRewriterMixin(object):
|
|||||||
# (r'(?<=document\.)cookie', RegexRewriter.add_prefix(prefix), 0),
|
# (r'(?<=document\.)cookie', RegexRewriter.add_prefix(prefix), 0),
|
||||||
|
|
||||||
#todo: move to mixin?
|
#todo: move to mixin?
|
||||||
(r'(?<=[\s=(){])(top)\s*(?:[!})]|==|$)',
|
(r'(?<=[\s=(){])(top)\s*(?:[!}?)]|==|$)',
|
||||||
RegexRewriter.add_prefix(prefix), 1),
|
RegexRewriter.add_prefix(prefix), 1),
|
||||||
|
|
||||||
(r'^(top)\s*(?:[!})]|==|$)',
|
(r'^(top)\s*(?:[!})]|==|$)',
|
||||||
|
@ -218,6 +218,9 @@ class RewriteContent:
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _resolve_text_type(mod, text_type, stream):
|
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
|
# only attempt to resolve between html and other text types
|
||||||
if text_type != 'html':
|
if text_type != 'html':
|
||||||
return mod, stream
|
return mod, stream
|
||||||
|
@ -352,7 +352,7 @@ __wbvidrw = (function() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function do_replace_iframe(elem, url) {
|
function do_replace_iframe(elem, url) {
|
||||||
var iframe = document.createElement("iframe", true);
|
var iframe = document.createElement("iframe");
|
||||||
var dim = get_dim(elem);
|
var dim = get_dim(elem);
|
||||||
iframe.width = dim[0];
|
iframe.width = dim[0];
|
||||||
iframe.height = dim[1];
|
iframe.height = dim[1];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user