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

wombat postMessage override tweaking (#473)

Browse Source 
* removed the definition of `__WB_pmw` from `ensureServerSideInjectsExistOnWindow` in order to allow more proper handling of that definition t occur from `initNewWindowWombat` or `wombatInit`.

`initNewWindowWombat` now initializes wombat for (i)frame's with src values prefixed with about: as about:srcdoc is commonly used

tweaked postMessage and event listener overrides to be more like the previous wombat revision

* rebased on develop and rebuilt bundle
This commit is contained in:
John Berlin 2019-06-04 12:10:49 -04:00 committed by Ilya Kreymer
parent 4a4e6c2b33
commit 85435433e8
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pywb/static/wombat.js
View File

File diff suppressed because one or more lines are too long

22
wombat/src/wombat.js
View File

@ -1410,11 +1410,6 @@ Wombat.prototype.ensureServerSideInjectsExistOnWindow = function(win) {
); );
}; };
} }
if (typeof !win.__WB_pmw !== 'function') {
win.__WB_pmw = function(obj) {
return obj;
};
}
}; };
/** /**
@ -4360,7 +4355,7 @@ Wombat.prototype.initNewWindowWombat = function(win, src) {
if ( if (
!src || !src ||
src === '' || src === '' ||
src === 'about:blank' || this.startsWith(src, 'about:') ||
src.indexOf('javascript:') >= 0 src.indexOf('javascript:') >= 0
) { ) {
// win._WBWombat = wombat_internal(win); // win._WBWombat = wombat_internal(win);
@ -4682,20 +4677,19 @@ Wombat.prototype.initPostMessageOverride = function($wbwindow) {
var from; var from;
var src_id; var src_id;
var this_obj = wombat.proxyToObj(this); var this_obj = wombat.proxyToObj(this);
if (this_obj.__WB_source && this_obj.__WB_source.WB_wombat_location) { if (this_obj.__WB_source && this_obj.__WB_source.WB_wombat_location) {
var source = this_obj.__WB_source; var source = this_obj.__WB_source;
from = source.WB_wombat_location.origin; from = source.WB_wombat_location.origin;
if (!this_obj.__WB_win_id) { if (!this_obj.__WB_win_id) {
this_obj.__WB_win_id = {}; this_obj.__WB_win_id = {};
this_obj.__WB_counter = 0; this_obj.__WB_counter = 0;
} }
if (!source.__WB_id) { if (!source.__WB_id) {
var id = this_obj.__WB_counter;
source.__WB_id = id + source.WB_wombat_location.href;
this_obj.__WB_counter += 1; this_obj.__WB_counter += 1;
source.__WB_id = this_obj.__WB_counter + source.WB_wombat_location.href;
} }
this_obj.__WB_win_id[source.__WB_id] = source; this_obj.__WB_win_id[source.__WB_id] = source;
@ -4736,7 +4730,7 @@ Wombat.prototype.initPostMessageOverride = function($wbwindow) {
targetOrigin = this_obj.location.origin; targetOrigin = this_obj.location.origin;
} }
// console.log("Sending " + from + " -> " + to + " (" + targetOrigin + ") " + message); // console.log(`Sending ${from} -> ${to_origin} (${targetOrigin}) ${message}`);
return orig.call(this_obj, new_message, targetOrigin, transfer); return orig.call(this_obj, new_message, targetOrigin, transfer);
}; };
@ -4759,7 +4753,7 @@ Wombat.prototype.initPostMessageOverride = function($wbwindow) {
useCapture useCapture
) { ) {
var obj = wombat.proxyToObj(this); var obj = wombat.proxyToObj(this);
var rwListener = listener; var rwListener;
if (type === 'message') { if (type === 'message') {
rwListener = wombat.message_listeners.add_or_get(listener, function() { rwListener = wombat.message_listeners.add_or_get(listener, function() {
return wrapEventListener(listener, obj, wombat); return wrapEventListener(listener, obj, wombat);
@ -4768,6 +4762,8 @@ Wombat.prototype.initPostMessageOverride = function($wbwindow) {
wombat.storage_listeners.add_or_get(listener, function() { wombat.storage_listeners.add_or_get(listener, function() {
return wrapSameOriginEventListener(listener, obj); return wrapSameOriginEventListener(listener, obj);
}); });
} else {
rwListener = listener;
} }
if (rwListener) { if (rwListener) {
return _oAddEventListener.call(obj, type, rwListener, useCapture); return _oAddEventListener.call(obj, type, rwListener, useCapture);
@ -4782,12 +4778,14 @@ Wombat.prototype.initPostMessageOverride = function($wbwindow) {
useCapture useCapture
) { ) {
var obj = wombat.proxyToObj(this); var obj = wombat.proxyToObj(this);
var rwListener = listener; var rwListener;
if (type === 'message') { if (type === 'message') {
rwListener = wombat.message_listeners.remove(listener); rwListener = wombat.message_listeners.remove(listener);
} else if (type === 'storage') { } else if (type === 'storage') {
wombat.storage_listeners.remove(listener); wombat.storage_listeners.remove(listener);
} else {
rwListener = listener;
} }
if (rwListener) { if (rwListener) {