suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hang saving snapshots on some pages (e.g. permanent Wikipedia URLs)

Browse Source
This commit is contained in:
Dan Stillman 2007-10-30 00:33:38 +00:00
parent ddc348531f
commit fdfc153f4c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chrome/content/zotero/webpagedump/domsaver.js
View File

@ -545,16 +545,20 @@ var wpdDOMSaver = {
{ {
if ( (WPD_CSSSCROLLBUG) && ( aHTMLText.match(/background:/i)) ) { if ( (WPD_CSSSCROLLBUG) && ( aHTMLText.match(/background:/i)) ) {
// Regex fixed by Dan for Zotero // Regex fixed by Dan for Zotero
//var re = new RegExp(/style=\"(.*)background:(.*)(repeat scroll 0(?:pt|px|%);)/);
var re = new RegExp(/style=\"([^\"]*)background:([^;\"]*)(repeat scroll 0(?:pt|px|%);?)/); var re = new RegExp(/style=\"([^\"]*)background:([^;\"]*)(repeat scroll 0(?:pt|px|%);?)/);
while ( re.exec( aHTMLText ) ) { while ( re.exec( aHTMLText ) ) {
var firstPart = RegExp.$1; var firstPart = RegExp.$1;
var secondPart = RegExp.$2; var secondPart = RegExp.$2;
var thirdPart = RegExp.$3.replace(/scroll 0(pt|px|%);/g, ';'); // '?' added by Dan for Zotero
//var thirdPart = RegExp.$3.replace(/scroll 0(pt|px|%);/g, ';');
var thirdPart = RegExp.$3.replace(/scroll 0(pt|px|%);?/g, ';');
aHTMLText = aHTMLText.replace(re,"style=\""+firstPart+"background:"+secondPart+thirdPart); aHTMLText = aHTMLText.replace(re,"style=\""+firstPart+"background:"+secondPart+thirdPart);
} }
} }
if ( (WPD_CSSBACKGROUNDPOSITIONBUG) && ( aHTMLText.match(/background-position: /i)) ) { if ( (WPD_CSSBACKGROUNDPOSITIONBUG) && ( aHTMLText.match(/background-position: /i)) ) {
// Regex fixed by Dan for Zotero // Regex fixed by Dan for Zotero
//var re = new RegExp(/style=\"(.*)background-position: 0(?:pt|px|%);/);
var re = new RegExp(/style=\"([^\"]*)background-position: 0(?:pt|px|%);/); var re = new RegExp(/style=\"([^\"]*)background-position: 0(?:pt|px|%);/);
while ( re.exec( aHTMLText ) ) { while ( re.exec( aHTMLText ) ) {
aHTMLText = aHTMLText.replace(re,"style=\""+RegExp.$1+"background-position: ;"); aHTMLText = aHTMLText.replace(re,"style=\""+RegExp.$1+"background-position: ;");