From fe55d7e895988eb3515d08ae3cfb0dd142e87051 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Sat, 2 Sep 2017 12:53:52 -0700 Subject: [PATCH] client-side (wombat) fixes: - anchor property override: don't set prop to "href"! - frames override: catch exception (cross-origin access) --- pywb/static/wombat.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pywb/static/wombat.js b/pywb/static/wombat.js index 17cab17c..a499f6cd 100644 --- a/pywb/static/wombat.js +++ b/pywb/static/wombat.js @@ -533,13 +533,12 @@ var _WBWombat = function($wbwindow, wbinfo) { if (prop == "hash") { value = this._parser[prop]; + orig_setter.call(this, "hash", value); } else { - prop = "href"; rel = rel || (value == this._parser.pathname); value = rewrite_url(this._parser.href, rel); + orig_setter.call(this, "href", value); } - - orig_setter.call(this, prop, value); } return setter; @@ -1773,7 +1772,9 @@ var _WBWombat = function($wbwindow, wbinfo) { var getter = function() { for (var i = 0; i < this.__wb_frames.length; i++) { - init_new_window_wombat(this.__wb_frames[i]); + try { + init_new_window_wombat(this.__wb_frames[i]); + } catch (e) {} } return this.__wb_frames; };