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

Fix wombats overrides of document.[write, writeln] to account for the variadic case (#325)

Browse Source 
* tweaked wombats overrides of document.[write, writeln] to account for the variadic case (https://html.spec.whatwg.org/multipage/dom.html#the-document-object)
Fixes #324

* added handling arguments length is 0 per PR comment
This commit is contained in:
John Berlin 2018-05-20 15:55:41 -04:00 committed by Ilya Kreymer
parent 9acad27801
commit 18cc71af3b
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pywb/static/wombat.js
View File

@ -92,6 +92,9 @@ var _WBWombat = function($wbwindow, wbinfo) {
var message_listeners = new FuncMap(); var message_listeners = new FuncMap();
var storage_listeners = new FuncMap(); var storage_listeners = new FuncMap();
// to avoid incurring the cost of our override
var origFunctionApply = $wbwindow.Function.prototype.apply;
//============================================ //============================================
function is_host_url(str) { function is_host_url(str) {
// Good guess that's its a hostname // Good guess that's its a hostname
@ -2607,18 +2610,32 @@ var _WBWombat = function($wbwindow, wbinfo) {
return; return;
} }
// both document.[write,writeln] are variadic functions
// we must concatenate the arguments when length > 1
// Write // Write
var orig_doc_write = $wbwindow.document.write; var orig_doc_write = $wbwindow.document.write;
var new_write = function(string) { var new_write = function() {
new_buff = rewrite_html(string, true); var argLen = arguments.length;
var string;
if (argLen === 0) {
return orig_doc_write.call(this);
} else if (argLen === 1) {
string = arguments[0];
} else {
// using Array.apply for optimization reasons
var argArray = origFunctionApply.call($wbwindow.Array, arguments);
string = argArray.join('');
}
var new_buff = rewrite_html(string, true);
if (!new_buff) { if (!new_buff) {
return; return;
} }
var res = orig_doc_write.call(this, new_buff); var res = orig_doc_write.call(this, new_buff);
init_new_window_wombat(this.defaultView); init_new_window_wombat(this.defaultView);
return res; return res;
} };
$wbwindow.document.write = new_write; $wbwindow.document.write = new_write;
$wbwindow.Document.prototype.write = new_write; $wbwindow.Document.prototype.write = new_write;
@ -2626,15 +2643,25 @@ var _WBWombat = function($wbwindow, wbinfo) {
// Writeln // Writeln
var orig_doc_writeln = $wbwindow.document.writeln; var orig_doc_writeln = $wbwindow.document.writeln;
var new_writeln = function(string) { var new_writeln = function() {
new_buff = rewrite_html(string, true); var argLen = arguments.length;
var string;
if (argLen === 0) {
return orig_doc_writeln.call(this);
} else if (argLen === 1) {
string = arguments[0];
} else {
var argArray = origFunctionApply.call($wbwindow.Array, arguments);
string = argArray.join('');
}
var new_buff = rewrite_html(string, true);
if (!new_buff) { if (!new_buff) {
return; return;
} }
var res = orig_doc_writeln.call(this, new_buff); var res = orig_doc_writeln.call(this, new_buff);
init_new_window_wombat(this.defaultView); init_new_window_wombat(this.defaultView);
return res; return res;
} };
$wbwindow.document.writeln = new_writeln; $wbwindow.document.writeln = new_writeln;
$wbwindow.Document.prototype.writeln = new_writeln; $wbwindow.Document.prototype.writeln = new_writeln;
@ -2646,7 +2673,7 @@ var _WBWombat = function($wbwindow, wbinfo) {
var res = orig_doc_open.call(this); var res = orig_doc_open.call(this);
init_new_window_wombat(this.defaultView); init_new_window_wombat(this.defaultView);
return res; return res;
} };
$wbwindow.document.open = new_open; $wbwindow.document.open = new_open;
$wbwindow.Document.prototype.open = new_open; $wbwindow.Document.prototype.open = new_open;