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

Merge branch 0.6.6 into video

Browse Source
This commit is contained in:
Ilya Kreymer 2014-12-14 15:36:14 -08:00
commit 0de76189a7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.rst
View File

@ -7,6 +7,8 @@ Video/streaming content replay and buffering improvements!
pywb 0.6.6 changelist
~~~~~~~~~~~~~~~~~~~~~
* JS client side improvements: check for double-inits, preserve anchor in wb.js top location redirect
* JS Rewriters: add mixins for link + location (default), link only, location only rewriting by setting ``js_rewrite_location`` to ``all``, ``urls``, ``location``, respectively.
(New: location only rewriting does not change JS urls)
@ -34,7 +36,6 @@ pywb 0.6.5 changelist
* cdx-indexer: Detect non-gzip chunk encoded .warc.gz/arc.gz archive files and show a meaningful
error message explaining how to fix issue (uncompress and possibly use warctools warc2warc to recompress)
>>>>>>> develop
pywb 0.6.4 changelist

4
pywb/static/wb.js
View File

@ -129,11 +129,13 @@ this.load = function() {
if ((window.self == window.top) && wbinfo) {
var hash = window.location.hash;
var loc = window.location.href.replace(window.location.hash, "");
if (wbinfo.top_url && (loc != wbinfo.top_url) && wbinfo.mod != "bn_") {
// Auto-redirect to top frame
window.location.replace(wbinfo.top_url);
window.location.replace(wbinfo.top_url + hash);
} else {
// Init Banner (no frame or top frame)
add_event("readystatechange", init_banner, document);