mirror of
https://github.com/alexadam/save-as-ebook.git
synced 2025-09-10 17:34:47 +00:00
fix & & problem in title; Issue #10
This commit is contained in:
parent
1bfaa75c12
commit
eefc97bdfb
3 changed files with 22 additions and 8 deletions
|
@ -154,8 +154,7 @@ function force($content, withError) {
|
|||
contentString = contentString.replace(/ /gi, ' ');
|
||||
|
||||
// getHref() replace does not work (& is overwritten)
|
||||
contentString = contentString.replace(/&/ig, '&');
|
||||
contentString = contentString.replace(/&/ig, '&');
|
||||
contentString = escapeAmp(contentString);
|
||||
|
||||
return contentString;
|
||||
} catch (e) {
|
||||
|
@ -284,6 +283,7 @@ function getPageTitle(title) {
|
|||
if (title.trim().length === 0) {
|
||||
return 'ebook';
|
||||
}
|
||||
title = escapeAmp(title);
|
||||
return title;
|
||||
}
|
||||
|
||||
|
|
|
@ -35,10 +35,14 @@ function _buildEbook(allPages) {
|
|||
|
||||
console.log('Prepare Content...');
|
||||
|
||||
var ebookFileName = 'eBook.epub';
|
||||
|
||||
if (ebookTitle) {
|
||||
ebookName = ebookTitle + '.epub';
|
||||
ebookName = ebookTitle;
|
||||
ebookFileName = getEbookFileName(bookTitle) + '.epub';
|
||||
} else {
|
||||
ebookName = allPages[0].title + '.epub';
|
||||
ebookName = allPages[0].title;
|
||||
ebookFileName = getEbookFileName(allPages[0].title) + '.epub';
|
||||
}
|
||||
|
||||
var zip = new JSZip();
|
||||
|
@ -168,7 +172,7 @@ function _buildEbook(allPages) {
|
|||
.then(function(content) {
|
||||
done = true;
|
||||
console.log("done !");
|
||||
saveAs(content, ebookName);
|
||||
saveAs(content, ebookFileName);
|
||||
});
|
||||
|
||||
setTimeout(function() {
|
||||
|
@ -179,7 +183,7 @@ function _buildEbook(allPages) {
|
|||
type: "blob"
|
||||
})
|
||||
.then(function(content) {
|
||||
saveAs(content, ebookName);
|
||||
saveAs(content, ebookFileName);
|
||||
});
|
||||
}, 60000);
|
||||
|
||||
|
|
|
@ -167,8 +167,7 @@ function getAbsoluteUrl(urlStr) {
|
|||
} else if (urlStr.indexOf('http') !== 0) {
|
||||
absoluteUrl = currentUrl + '/' + urlStr;
|
||||
}
|
||||
absoluteUrl = absoluteUrl.replace(/&/ig, '&');
|
||||
absoluteUrl = absoluteUrl.replace(/&/ig, '&');
|
||||
absoluteUrl = escapeAmp(absoluteUrl);
|
||||
return absoluteUrl;
|
||||
} catch (e) {
|
||||
console.log('Error:', e);
|
||||
|
@ -291,3 +290,14 @@ function generateRandomTag(tagLen) {
|
|||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
function escapeAmp(text) {
|
||||
var newText = text.replace(/&/ig, '&');
|
||||
newText = newText.replace(/&/ig, '&');
|
||||
return newText;
|
||||
}
|
||||
|
||||
function getEbookFileName(name) {
|
||||
var newName = name.replace(/&/ig, '&');
|
||||
return newName;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue