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 errors from merge

Browse Source
This commit is contained in:
Ilya Kreymer 2014-08-05 11:14:22 -07:00
parent 95c3f080c3
commit da6c61376c
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pywb/rewrite/rewrite_content.py
View File

@ -140,10 +140,6 @@ class RewriteContent:
return (status_headers, gen, False) return (status_headers, gen, False)
if wb_url.is_banner_only:
gen = self._head_insert_only_gen(head_insert_str, stream)
return (status_headers, gen, False)
rewriter = rewriter_class(urlrewriter, rewriter = rewriter_class(urlrewriter,
js_rewriter_class=rule.rewriters['js'], js_rewriter_class=rule.rewriters['js'],
css_rewriter_class=rule.rewriters['css'], css_rewriter_class=rule.rewriters['css'],

2
pywb/static/wb_frame.js
View File

@ -89,6 +89,8 @@ function set_state(state) {
label.innerHTML = _wb_js.labels.REPLAY_MSG; label.innerHTML = _wb_js.labels.REPLAY_MSG;
} }
} }
curr_state = state;
} }
window.onpopstate = function(event) { window.onpopstate = function(event) {

4
setup.py
View File

@ -34,11 +34,7 @@ class PyTest(TestCommand):
setup( setup(
name='pywb', name='pywb',
<<<<<<< HEAD
version='0.6.0', version='0.6.0',
=======
version='0.5.3',
>>>>>>> 0.5.4-fixes
url='https://github.com/ikreymer/pywb', url='https://github.com/ikreymer/pywb',
author='Ilya Kreymer', author='Ilya Kreymer',
author_email='ikreymer@gmail.com', author_email='ikreymer@gmail.com',