+
+
## How to install it
### From [Chrome Web Store](https://chrome.google.com/webstore/detail/save-as-ebook/haaplkpoiimngbppjihnegfmpejdnffj)
@@ -43,21 +45,91 @@ sudo apt-get install calibre
ebook-convert "book.epub" "book.mobi"
```
+## Default Keyboard Shortcuts
+
+**NOTE** These shortcuts are not fixed and the browser will assign a different shortcut if the default one is taken
+
+| Shortcut | Description |
+| --- | --- |
+| Alt + Shift + 1 | Save current page as eBook |
+| Alt + Shift + 2 | Save current selection as eBook |
+| Alt + Shift + 3 | Add current page as chapter |
+| Alt + Shift + 4 | Add current selection as chapter |
+
+## How to change the default Shortcuts
+
+in Chrome:
+
+```
+1. Navigate to chrome://extensions/
+2. Scroll down
+3. Click on Keyboard shortcuts
+```
+
+## Added in 1.4.2
+ - Added MIME type to the generated .epub file
+
+## Added in 1.4.1
+ - Remove unnecessary permissions
+ - Detect image type if the URL doesn't have a file extension (jpg, gif, png)
+ - Reset the Busy indicator on errors
+ - Remove hidden elements when style is not included
+ - Replace iframes with divs
+
+## Added in 1.4
+ - Smaller ebook file size
+ - Fix for #37 - custom styles not applied
+ - Fix for #36 - br tag missing from pre blocks
+ - Fix for #31 - hanging in Busy state
+ - Other misc bug fixes
+
+## Added in v1.3.4
+ - Fix for MathML - the rendered expression is too large (Issue #26)
+ - Add translation in Russian (thanks to @ Emil Khalikov) & Brazilian Portuguese (thanks to @welksonramos)
+
+## Added in v1.3
+ - Keyboard shortcuts
+ - Simplified tool bar menu
+ - Misc bug fixes
+
+## Added in v1.2.2
+ - fixed & & issue in title; Issue # 10
+
+## Added in v1.2.1
+ - support for hr/br html tags
+
+## Added in v1.2
+ - BETA: Support for CSS
+ - BETA: Create / edit custom Styles
+ - No errors from EPUB Validator (http://validator.idpf.org/) + this should fix the Google Play upload issue
+
## Added in v1.1
- Chapter Editor: option to save changes
- Chapter Editor: option to remove all chapters
- persist Chapter Editor changes & chapters after generating an eBook or after a browser restart
## To-Do
- - fix all 'epubcheck' errors (https://github.com/IDPF/epubcheck)
+ - make the Custom Style Editor more user friendly
+ - support backup / restore for Custom Styles
+ - DONE fix all 'epubcheck' errors (https://github.com/IDPF/epubcheck)
- clean & optimize code
- create tests
- - 'save as image' option (render a selection and save it as image instead of text)
- support other formats (mobi, pdf etc.)
- show confirmations (ui/ux)
- display errors (ui/ux)
- - add settings & options page (ui/ux)
- - support custom style
+ - DONE support custom style
+ - add 'remove from ebook' right click menu action
+
+## Run Tests (Work in progress...)
+ ```
+ cd tests
+ yarn install # install puppeteer
+ node test/index.js # should start a chrome instance with Save as eBook loaded
+
+ # it will generate and save the ebook in ./tmp-downloads
+
+ ....
+ ```
## Credits
- http://ebooks.stackexchange.com/questions/1183/what-is-the-minimum-required-content-for-a-valid-epub
@@ -65,4 +137,5 @@ ebook-convert "book.epub" "book.mobi"
- https://stuk.github.io/jszip/
- http://johnny.github.io/jquery-sortable/
- https://github.com/eligrey/FileSaver.js/
- - https://www.iconfinder.com/icons/1031371/book_empty_library_reading_icon#size=128
+ - https://www.iconfinder.com/icons/753890/book_books_education_library_study_icon#size=128
+ - Thanks to [pumpk0n](https://github.com/pumpk0n) and [Francois Bocquet](https://github.com/fbocquet) for helping me with the French translation
diff --git a/ex1.png b/ex1.png
deleted file mode 100644
index f6de59c..0000000
Binary files a/ex1.png and /dev/null differ
diff --git a/ex11.png b/ex11.png
new file mode 100644
index 0000000..3d60c53
Binary files /dev/null and b/ex11.png differ
diff --git a/ex3.png b/ex3.png
new file mode 100644
index 0000000..88a153e
Binary files /dev/null and b/ex3.png differ
diff --git a/tests.tar b/tests.tar
deleted file mode 100644
index d18f9ca..0000000
Binary files a/tests.tar and /dev/null differ
diff --git a/tests/index.js b/tests/index.js
new file mode 100644
index 0000000..6988655
--- /dev/null
+++ b/tests/index.js
@@ -0,0 +1,52 @@
+const puppeteer = require('puppeteer');
+const fs = require('fs')
+
+const CRX_PATH = '../web-extension';
+const REFERENCE_EBOOK_PATH = 'reference-ebook'
+const TEST_RESULT_EBOOK_PATH = 'test-result-ebook'
+const TEST_EBOOK_FILE_NAME = 'test.epub'
+
+const testPaths = [
+
+]
+
+puppeteer.launch({
+ headless: false,
+ args: [
+ `--disable-extensions-except=${CRX_PATH}`,
+ `--load-extension=${CRX_PATH}`,
+ '--user-agent=PuppeteerTestingAgent'
+ ]
+}).then(async browser => {
+
+ prepareTests()
+
+ await runLocalFullPageTests(browser)
+});
+
+async function runLocalFullPageTests(browser) {
+
+ const testedFileName = 'mathjax' //'canvas' //'svg' //'special-chars' // 'p2' //'p1'
+
+ const testUrl = 'file://'+__dirname+'/pages/'+testedFileName+'/page/index.html'
+ const resultDownloadPath = './pages/'+testedFileName+'/' + TEST_RESULT_EBOOK_PATH
+
+ const page = await browser.newPage();
+ await page._client.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: resultDownloadPath});
+ await page.setViewport({ width: 1280, height: 800 })
+ // await page.goto('https://en.wikipedia.org/wiki/E-book', { waitUntil: 'networkidle0' });
+ // await page.goto('file://'+__dirname+'/../pages/p1/E-book - Wikipedia.html', { waitUntil: 'networkidle0' });
+ await page.goto(testUrl, { waitUntil: 'networkidle0' });
+}
+
+function prepareTests() {
+ const testedFileName = 'p1'
+ const pathToDelete = './pages/'+testedFileName+'/'+TEST_RESULT_EBOOK_PATH+'/'+TEST_EBOOK_FILE_NAME
+ try {
+ if (fs.existsSync(pathToDelete)) {
+ fs.unlinkSync(pathToDelete)
+ }
+ } catch(err) {
+ console.log('Error while deleting file ', err);
+ }
+}
\ No newline at end of file
diff --git a/tests/package.json b/tests/package.json
new file mode 100644
index 0000000..f4adacd
--- /dev/null
+++ b/tests/package.json
@@ -0,0 +1,9 @@
+{
+ "name": "web-extension-test",
+ "version": "1.0.0",
+ "main": "index.js",
+ "license": "MIT",
+ "dependencies": {
+ "puppeteer": "^1.14.0"
+ }
+}
diff --git a/tests/pages.zip b/tests/pages.zip
new file mode 100644
index 0000000..7e5ecce
Binary files /dev/null and b/tests/pages.zip differ
diff --git a/web-extension/_locales/en/messages.json b/web-extension/_locales/en/messages.json
new file mode 100644
index 0000000..951c629
--- /dev/null
+++ b/web-extension/_locales/en/messages.json
@@ -0,0 +1,94 @@
+{
+ "extName": {
+ "message": "Save as eBook",
+ "description": "Extension name"
+ },
+ "includeStyle": {
+ "message": "Include (Custom) Style"
+ },
+ "editStyles": {
+ "message": "Edit Custom Styles ..."
+ },
+ "savePage": {
+ "message": "Save Page"
+ },
+ "saveSelection": {
+ "message": "Save Selection"
+ },
+ "pageChapter": {
+ "message": "Add Page as Chapter"
+ },
+ "selectionChapter": {
+ "message": "Add Selection as Chapter"
+ },
+ "editChapters": {
+ "message": "Edit Chapters ..."
+ },
+ "waitMessage": {
+ "message": "Please Wait ..."
+ },
+ "chapterEditorTitle": {
+ "message": "Chapter Editor"
+ },
+ "ebookTitleLabel": {
+ "message": "eBook Title:"
+ },
+ "rawPreview": {
+ "message": "Raw Preview"
+ },
+ "remove": {
+ "message": "Remove"
+ },
+ "removeChapters": {
+ "message": "Remove Chapters"
+ },
+ "removeChaptersConfirm": {
+ "message": "Do you want to remove all chapters?"
+ },
+ "cancel": {
+ "message": "Cancel"
+ },
+ "generateEbook": {
+ "message": "Generate eBook ..."
+ },
+ "saveChanges": {
+ "message": "Save changes"
+ },
+ "emptyBookWarning": {
+ "message": "Can't generate an empty eBook!"
+ },
+ "confirmDeleteStyle": {
+ "message": "Are you sure you want to delete this style?"
+ },
+ "invalidRegex": {
+ "message": "Invalid regular expression"
+ },
+ "styleSaved": {
+ "message": "Style saved!"
+ },
+ "styleEditor": {
+ "message": "Style Editor"
+ },
+ "selectExistingCSS": {
+ "message": "Select Existing CSS"
+ },
+ "orLabel": {
+ "message": "or"
+ },
+ "createNewStyle": {
+ "message": "Create New Style"
+ },
+ "styleNameLabel": {
+ "message": "Name"
+ },
+ "howToWriteRegexLabel": {
+ "message": "How to write a regular expression pattern"
+ },
+ "removeStyle": {
+ "message": "Remove Style"
+ },
+ "saveStyle": {
+ "message": "Save Style"
+ }
+
+}
diff --git a/web-extension/_locales/fr/messages.json b/web-extension/_locales/fr/messages.json
new file mode 100644
index 0000000..5366e29
--- /dev/null
+++ b/web-extension/_locales/fr/messages.json
@@ -0,0 +1,99 @@
+{
+ "extName": {
+ "message": "Enregistrer comme eBook",
+ "description": "Nom de l'extension"
+ },
+ "includeStyle": {
+ "message": "Inclure le style"
+ },
+ "styleLabel": {
+ "message": "Style personnalisé :"
+ },
+ "applyStyle": {
+ "message": "Appliquer"
+ },
+ "editStyles": {
+ "message": "Éditer les styles..."
+ },
+ "savePage": {
+ "message": "Enregistrer la page"
+ },
+ "saveSelection": {
+ "message": "Enregistrer la sélection"
+ },
+ "pageChapter": {
+ "message": "Ajouter la page en tant que chapitre"
+ },
+ "selectionChapter": {
+ "message": "Ajouter la sélection en tant que chapitre"
+ },
+ "editChapters": {
+ "message": "Modifier les chapitres..."
+ },
+ "waitMessage": {
+ "message": "Merci de patienter..."
+ },
+ "chapterEditorTitle": {
+ "message": "Éditeur de chapitre"
+ },
+ "ebookTitleLabel": {
+ "message": "Titre de l'eBook :"
+ },
+ "rawPreview": {
+ "message": "Aperçu brut"
+ },
+ "remove": {
+ "message": "Retirer"
+ },
+ "removeChapters": {
+ "message": "Supprimer les chapitres"
+ },
+ "removeChaptersConfirm": {
+ "message": "Voulez-vous supprimer tous les chapitres ?"
+ },
+ "cancel": {
+ "message": "Annuler"
+ },
+ "generateEbook": {
+ "message": "Générer l'eBook..."
+ },
+ "saveChanges": {
+ "message": "Enregistrer les modifications"
+ },
+ "emptyBookWarning": {
+ "message": "Impossible de générer un eBook vide !"
+ },
+ "confirmDeleteStyle": {
+ "message": "Êtes-vous sûr de vouloir supprimer ce style ?"
+ },
+ "invalidRegex": {
+ "message": "Expression régulière invalide"
+ },
+ "styleSaved": {
+ "message": "Style enregistré !"
+ },
+ "styleEditor": {
+ "message": "Éditeur de style"
+ },
+ "selectExistingCSS": {
+ "message": "Sélectionner un style existant"
+ },
+ "orLabel": {
+ "message": "ou"
+ },
+ "createNewStyle": {
+ "message": "Créer un nouveau style"
+ },
+ "styleNameLabel": {
+ "message": "Nom"
+ },
+ "howToWriteRegexLabel": {
+ "message": "Comment écrire une expression régulière"
+ },
+ "removeStyle": {
+ "message": "Supprimer le style"
+ },
+ "saveStyle": {
+ "message": "Enregistrer le style"
+ }
+}
diff --git a/web-extension/_locales/pt_BR/messages.json b/web-extension/_locales/pt_BR/messages.json
new file mode 100644
index 0000000..9c59f7c
--- /dev/null
+++ b/web-extension/_locales/pt_BR/messages.json
@@ -0,0 +1,93 @@
+{
+ "extName": {
+ "message": "Salvar como eBook",
+ "description": "Nome da extensão"
+ },
+ "includeStyle": {
+ "message": "Incuir estilo (personalizado)"
+ },
+ "editStyles": {
+ "message": "Editar estilos personalizados ..."
+ },
+ "savePage": {
+ "message": "Salvar Página"
+ },
+ "saveSelection": {
+ "message": "Salvar Selecão"
+ },
+ "pageChapter": {
+ "message": "Adicionar página como capítulo"
+ },
+ "selectionChapter": {
+ "message": "Adicionar seleção como capítulo"
+ },
+ "editChapters": {
+ "message": "Editar Capítulos ..."
+ },
+ "waitMessage": {
+ "message": "Por favor, aguarde ..."
+ },
+ "chapterEditorTitle": {
+ "message": "Editor de capítulos"
+ },
+ "ebookTitleLabel": {
+ "message": "Título do eBook:"
+ },
+ "rawPreview": {
+ "message": "Pré-visualização"
+ },
+ "remove": {
+ "message": "Remover"
+ },
+ "removeChapters": {
+ "message": "Remover capítulos"
+ },
+ "removeChaptersConfirm": {
+ "message": "Você quer remover todos os capítulos?"
+ },
+ "cancel": {
+ "message": "Cancelar"
+ },
+ "generateEbook": {
+ "message": "Gerar eBook ..."
+ },
+ "saveChanges": {
+ "message": "Salvar alterações"
+ },
+ "emptyBookWarning": {
+ "message": "Não é possível gerar um eBook vazio!"
+ },
+ "confirmDeleteStyle": {
+ "message": "Tem certeza de que deseja excluir este estilo?"
+ },
+ "invalidRegex": {
+ "message": "Expressão regular inválida"
+ },
+ "styleSaved": {
+ "message": "Estilo salvo!"
+ },
+ "styleEditor": {
+ "message": "Editor de estilo"
+ },
+ "selectExistingCSS": {
+ "message": "Selecionar CSS Existente"
+ },
+ "orLabel": {
+ "message": "ou"
+ },
+ "createNewStyle": {
+ "message": "Criar Novo Estilo"
+ },
+ "styleNameLabel": {
+ "message": "Nome"
+ },
+ "howToWriteRegexLabel": {
+ "message": "Como escrever um padrão de expressão regular"
+ },
+ "removeStyle": {
+ "message": "Remover Estilo"
+ },
+ "saveStyle": {
+ "message": "Salvar Estilo"
+ }
+}
\ No newline at end of file
diff --git a/web-extension/_locales/ru/messages.json b/web-extension/_locales/ru/messages.json
new file mode 100644
index 0000000..7726ba9
--- /dev/null
+++ b/web-extension/_locales/ru/messages.json
@@ -0,0 +1,93 @@
+{
+ "extName": {
+ "message": "Save as eBook",
+ "description": "Extension name"
+ },
+ "includeStyle": {
+ "message": "Подключить CSS"
+ },
+ "editStyles": {
+ "message": "Редактировать CSS ..."
+ },
+ "savePage": {
+ "message": "Сохранить страницу"
+ },
+ "saveSelection": {
+ "message": "Сохранить выделение"
+ },
+ "pageChapter": {
+ "message": "Добавить страницу как главу"
+ },
+ "selectionChapter": {
+ "message": "Добавить выделение как главу"
+ },
+ "editChapters": {
+ "message": "Редактировать главы ..."
+ },
+ "waitMessage": {
+ "message": "Пожалуйста ожидайте ..."
+ },
+ "chapterEditorTitle": {
+ "message": "Редактор глав"
+ },
+ "ebookTitleLabel": {
+ "message": "Заголовок книги:"
+ },
+ "rawPreview": {
+ "message": "Предпросмотр"
+ },
+ "remove": {
+ "message": "Удалить"
+ },
+ "removeChapters": {
+ "message": "Удалить главы"
+ },
+ "removeChaptersConfirm": {
+ "message": "Вы точно хотите удалить все главы?"
+ },
+ "cancel": {
+ "message": "Отмена"
+ },
+ "generateEbook": {
+ "message": "Создать книгу ..."
+ },
+ "saveChanges": {
+ "message": "Сохранить изменения"
+ },
+ "emptyBookWarning": {
+ "message": "Невозможно создать пустую книгу"
+ },
+ "confirmDeleteStyle": {
+ "message": "Вы точно хотите удалить этот стиль?"
+ },
+ "invalidRegex": {
+ "message": "Ошибка в регулярном выражении"
+ },
+ "styleSaved": {
+ "message": "Стиль сохранен!"
+ },
+ "styleEditor": {
+ "message": "Редактор стилей"
+ },
+ "selectExistingCSS": {
+ "message": "Выбрать существующий стиль"
+ },
+ "orLabel": {
+ "message": "или"
+ },
+ "createNewStyle": {
+ "message": "Создать новый стиль"
+ },
+ "styleNameLabel": {
+ "message": "Название"
+ },
+ "howToWriteRegexLabel": {
+ "message": "Введите регулярное выражение для адреса"
+ },
+ "removeStyle": {
+ "message": "Удалить стиль"
+ },
+ "saveStyle": {
+ "message": "Сохранить стиль"
+ }
+}
\ No newline at end of file
diff --git a/web-extension/background.js b/web-extension/background.js
index c1c75a1..a577260 100644
--- a/web-extension/background.js
+++ b/web-extension/background.js
@@ -1,5 +1,354 @@
-chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
+///////////////////
+///////////////////
+///////////////////
+///////////////////
+/// Only for testing
+
+chrome.runtime.onInstalled.addListener(details => {
+ if (navigator.userAgent === 'PuppeteerTestingAgent') {
+ let TEST_TIMER = null
+ chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
+ if (TEST_TIMER) {
+ clearTimeout(TEST_TIMER)
+ }
+
+ TEST_TIMER = setTimeout(()=> {
+ executeCommand({type: 'save-page'})
+ }, 2000)
+ });
+ }
+});
+
+
+
+///////////////////
+///////////////////
+///////////////////
+///////////////////
+
+var isBusy = false;
+var busyResetTimer = null
+
+var defaultStyles = [
+ {
+ title: 'Reddit Comments',
+ url: 'reddit\\.com\\/r\\/[^\\/]+\\/comments',
+ style: `.side {
+display: none;
+}
+#header {
+display: none;
+}
+.arrow, .expand, .score, .live-timestamp, .flat-list, .buttons, .morecomments, .footer-parent, .icon {
+display: none !important;
+}
+`
+ },{
+ title: 'Wikipedia Article',
+ url: 'wikipedia\\.org\\/wiki\\/',
+ style: `#mw-navigation {
+display: none;
+}
+#footer {
+display: none;
+}
+#mw-panel {
+display: none;
+}
+#mw-head {
+display: none;
+}
+`
+ },{
+ title: 'YCombinator News Comments',
+ url: 'news\\.ycombinator\\.com\\/item\\?id=[0-9]+',
+ style: `#hnmain > tbody > tr:nth-child(1) > td > table {
+display: none;
+}
+* {
+background-color: white;
+}
+.title, .storylink {
+text-align: left;
+font-weight: bold;
+font-size: 20px;
+}
+.score {
+display: none;
+}
+.age {
+display: none;
+}
+.hnpast {
+display: none;
+}
+.togg {
+display: none;
+}
+.votelinks, .rank {
+display: none;
+}
+.votearrow {
+display: none;
+}
+.yclinks {
+display: none;
+}
+form {
+display: none;
+}
+a.hnuser {
+font-weight: bold;
+color: black !important;
+padding: 3px;
+}
+.subtext > span, .subtext > a:not(:nth-child(2)) {
+display: none;
+}
+`
+ },{
+ title: 'Medium Article',
+ url: 'medium\\.com',
+ style: `.metabar {
+display: none !important;
+}
+header.container {
+display: none;
+}
+.js-postShareWidget {
+display: none;
+}
+footer, canvas {
+display: none !important;
+}
+.u-fixed, .u-bottom0 {
+display: none;
+}
+`
+ },{
+ title: 'Twitter',
+ url: 'twitter\\.com\\/.+',
+ style: `.topbar {
+display: none !important;
+}
+.ProfileCanopy, .ProfileCanopy-inner {
+display: none;
+}
+.ProfileSidebar {
+display: none;
+}
+.ProfileHeading {
+display: none !important;
+}
+.ProfileTweet-actionList {
+display: none;
+}
+`
+ }
+
+];
+
+chrome.commands.onCommand.addListener((command) => {
+ executeCommand({type: command})
+});
+
+function executeCommand(command) {
+ if (isBusy) {
+ chrome.tabs.query({
+ currentWindow: true,
+ active: true
+ }, (tab) => {
+ chrome.tabs.sendMessage(tab[0].id, {'alert': 'Work in progress! Please wait until the current eBook is generated!'}, (r) => {
+ console.log(r);
+ });
+ })
+ return;
+ }
+ if (command.type === 'save-page') {
+ dispatch('extract-page', false, []);
+ } else if (command.type === 'save-selection') {
+ dispatch('extract-selection', false, []);
+ } else if (command.type === 'add-page') {
+ dispatch('extract-page', true, []);
+ } else if (command.type === 'add-selection') {
+ dispatch('extract-selection', true, []);
+ }
+
+ isBusy = true
+
+ //
+ busyResetTimer = setTimeout(() => {
+ resetBusy()
+ }, 20000)
+}
+
+function dispatch(action, justAddToBuffer, appliedStyles) {
+ if (!justAddToBuffer) {
+ _execRequest({type: 'remove'});
+ }
+ chrome.browserAction.setBadgeBackgroundColor({color:"red"});
+ chrome.browserAction.setBadgeText({text: "Busy"});
+
+ chrome.tabs.query({
+ currentWindow: true,
+ active: true
+ }, (tab) => {
+
+ isIncludeStyles((result) =>{
+ let isIncludeStyle = result.includeStyle
+ prepareStyles(tab, isIncludeStyle, appliedStyles, (tmpAppliedStyles) => {
+ applyAction(tab, action, justAddToBuffer, isIncludeStyle, tmpAppliedStyles, () => {
+ alert('done')
+ })
+ })
+ })
+ });
+}
+
+function isIncludeStyles(callback) {
+ chrome.storage.local.get('includeStyle', (data) => {
+ if (!data) {
+ callback({includeStyle: false});
+ } else {
+ callback({includeStyle: data.includeStyle});
+ }
+ });
+}
+
+function prepareStyles(tab, includeStyle, appliedStyles, callback) {
+ if (!includeStyle) {
+ callback(appliedStyles)
+ return
+ }
+
+ chrome.storage.local.get('styles', (data) => {
+ let styles = defaultStyles;
+ if (data && data.styles) {
+ styles = data.styles;
+ }
+ let currentUrl = tab[0].url;
+ let currentStyle = null;
+
+ if (!styles) {
+ callback(appliedStyles)
+ return
+ }
+
+ if (styles.length === 0) {
+ callback(appliedStyles)
+ return
+ }
+
+ let allMatchingStyles = [];
+
+ for (let i = 0; i < styles.length; i++) {
+ currentUrl = currentUrl.replace(/(http[s]?:\/\/|www\.)/i, '').toLowerCase();
+ let styleUrl = styles[i].url;
+ let styleUrlRegex = null;
+
+ try {
+ styleUrlRegex = new RegExp(styleUrl, 'i');
+ } catch (e) {
+ }
+
+ if (styleUrlRegex && styleUrlRegex.test(currentUrl)) {
+ allMatchingStyles.push({
+ index: i,
+ length: styleUrl.length
+ });
+ }
+ }
+
+ if (allMatchingStyles.length === 0) {
+ callback(appliedStyles)
+ return
+ }
+
+ allMatchingStyles.sort((a, b) => b.length - a.length);
+ let selStyle = allMatchingStyles[0];
+
+ if (!selStyle) {
+ callback(appliedStyles)
+ return
+ }
+
+ currentStyle = styles[selStyle.index];
+
+ if (!currentStyle) {
+ callback(appliedStyles)
+ return
+ }
+
+ if (!currentStyle.style) {
+ callback(appliedStyles)
+ return
+ }
+
+ chrome.tabs.insertCSS(tab[0].id, { code: currentStyle.style }, () => {
+ appliedStyles.push(currentStyle);
+ callback(appliedStyles)
+ });
+ });
+}
+
+function applyAction(tab, action, justAddToBuffer, includeStyle, appliedStyles, callback) {
+ chrome.tabs.sendMessage(tab[0].id, {
+ type: action,
+ includeStyle: includeStyle,
+ appliedStyles: appliedStyles
+ }, (response) => {
+
+ if (!response) {
+ resetBusy()
+ chrome.tabs.sendMessage(tab[0].id, {'alert': 'Save as eBook does not work on this web site!'}, (r) => {});
+ return;
+ }
+
+ if (response.content.trim() === '') {
+ resetBusy()
+ if (justAddToBuffer) {
+ chrome.tabs.sendMessage(tab[0].id, {'alert': 'Cannot add an empty selection as chapter!'}, (r) => {});
+ } else {
+ chrome.tabs.sendMessage(tab[0].id, {'alert': 'Cannot generate the eBook from an empty selection!'}, (r) => {});
+ }
+ return;
+ }
+ if (!justAddToBuffer) {
+ chrome.tabs.sendMessage(tab[0].id, {'shortcut': 'build-ebook', response: [response]}, (r) => {});
+ } else {
+ chrome.storage.local.get('allPages', (data) => {
+ if (!data || !data.allPages) {
+ data.allPages = [];
+ }
+ data.allPages.push(response);
+ chrome.storage.local.set({'allPages': data.allPages});
+ resetBusy()
+ chrome.tabs.sendMessage(tab[0].id, {'alert': 'Page or selection added as chapter!'}, (r) => {});
+ })
+ }
+ });
+}
+
+function resetBusy() {
+ isBusy = false
+
+ if (busyResetTimer) {
+ clearTimeout(busyResetTimer)
+ busyResetTimer = null
+ }
+
+ chrome.browserAction.setBadgeText({text: ""})
+
+ let popups = chrome.extension.getViews({type: "popup"});
+ if (popups && popups.length > 0) {
+ popups[0].close()
+ }
+}
+
+chrome.runtime.onMessage.addListener(_execRequest);
+
+function _execRequest(request, sender, sendResponse) {
if (request.type === 'get') {
chrome.storage.local.get('allPages', function (data) {
if (!data || !data.allPages) {
@@ -27,5 +376,54 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
if (request.type === 'set title') {
chrome.storage.local.set({'title': request.title});
}
+ if (request.type === 'get styles') {
+ chrome.storage.local.get('styles', function (data) {
+ if (!data || !data.styles) {
+ sendResponse({styles: defaultStyles});
+ } else {
+ sendResponse({styles: data.styles});
+ }
+ });
+ }
+ if (request.type === 'set styles') {
+ chrome.storage.local.set({'styles': request.styles});
+ }
+ if (request.type === 'get current style') {
+ chrome.storage.local.get('currentStyle', function (data) {
+ if (!data || !data.currentStyle) {
+ sendResponse({currentStyle: 0});
+ } else {
+ sendResponse({currentStyle: data.currentStyle});
+ }
+ });
+ }
+ if (request.type === 'set current style') {
+ chrome.storage.local.set({'currentStyle': request.currentStyle});
+ }
+ if (request.type === 'get include style') {
+ chrome.storage.local.get('includeStyle', function (data) {
+ if (!data) {
+ sendResponse({includeStyle: false});
+ } else {
+ sendResponse({includeStyle: data.includeStyle});
+ }
+ });
+ }
+ if (request.type === 'set include style') {
+ chrome.storage.local.set({'includeStyle': request.includeStyle});
+ }
+ if (request.type === 'is busy?') {
+ sendResponse({isBusy: isBusy})
+ }
+ if (request.type === 'set is busy') {
+ isBusy = request.isBusy
+ }
+ if (request.type === 'save-page' || request.type === 'save-selection' ||
+ request.type === 'add-page' || request.type === 'add-selection') {
+ executeCommand({type: request.type})
+ }
+ if (request.type === 'done') {
+ resetBusy()
+ }
return true;
-});
+}
diff --git a/web-extension/chapterEditor.css b/web-extension/chapterEditor.css
index c04c2f1..e3d42e2 100644
--- a/web-extension/chapterEditor.css
+++ b/web-extension/chapterEditor.css
@@ -18,7 +18,7 @@ ul.chapterEditor-chapters-list li.placeholder {
font-weight: bold;
float: left;
display: inline-block;
- font-family: "sans-serif";
+ font-family: sans-serif;
}
#chapterEditor-ebookTitleHolder {
@@ -35,7 +35,7 @@ ul.chapterEditor-chapters-list li.placeholder {
#chapterEditor-ebookTitle {
padding: 5px;
font-size: 15px;
- font-family: "sans-serif";
+ font-family: sans-serif;
width: 85%;
}
ul, ul.chapterEditor-chapters-list {
@@ -66,7 +66,7 @@ ul, ul.chapterEditor-chapters-list {
.chapterEditor-chapter-item > input[type="text"] {
padding: 5px;
font-size: 15px;
- font-family: "sans-serif";
+ font-family: sans-serif;
width: 80%;
border: none;
border-bottom: solid 1px #aaa;
@@ -79,9 +79,6 @@ ul, ul.chapterEditor-chapters-list {
}
#chapterEditor-modalList {
display: block;
- /*width: 100%;*/
- /*border-top: solid 1px black;*/
- /*border-bottom: solid 1px black;*/
padding: 20px;
padding-top: 0;
}
@@ -100,7 +97,7 @@ ul, ul.chapterEditor-chapters-list {
.chapterEditor-text-button {
border: none;
font-size: 15px;
- font-family: "sans-serif";
+ font-family: sans-serif;
padding: 5px;
background-color: rgba(0, 0, 0, 0);
margin: 0 3px;
@@ -123,6 +120,8 @@ ul, ul.chapterEditor-chapters-list {
}
.chapterEditor-footer-button {
+ position: relative;
+ overflow: hidden;
padding: 18px 20px;
margin: 0;
font-size: 18px;
@@ -135,10 +134,34 @@ ul, ul.chapterEditor-chapters-list {
background-color: rgba(0, 0, 0, 1);
cursor: pointer;
}
-.chapterEditor-generate-button {
+.chapterEditor-footer-button:after {
+ content: '';
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 5px;
+ height: 5px;
+ background: rgba(255, 255, 255, .5);
+ opacity: 0;
+ border-radius: 100%;
+ transform: scale(1, 1) translate(-50%);
+ transform-origin: 50% 50%;
+}
+@keyframes ripple {
+ 0% { transform: scale( 0, 0); opacity: 1; }
+ 20% { transform: scale(25, 25); opacity: 1; }
+ 100% { transform: scale(40, 40); opacity: 0; }
+}
+.chapterEditor-footer-button:focus:not(:active)::after {
+ animation: ripple 1s ease-out;
+}
+.chapterEditor-footer-button.chapterEditor-generate-button {
background-color: yellow;
}
-.chapterEditor-cancel-button {
+.chapterEditor-footer-button.chapterEditor-generate-button:hover {
+ background-color: rgba(0, 0, 0, 1);
+}
+.chapterEditor-footer-button.chapterEditor-cancel-button {
/*background-color: black;*/
}
diff --git a/web-extension/chapterEditor.js b/web-extension/chapterEditor.js
index d35544c..d54e4f3 100644
--- a/web-extension/chapterEditor.js
+++ b/web-extension/chapterEditor.js
@@ -26,7 +26,7 @@ function showEditor() {
// Header
var title = document.createElement('span');
title.id = "chapterEditor-Title";
- title.innerText = "Chapter Editor";
+ title.innerText = chrome.i18n.getMessage('chapterEditorTitle');
var upperCloseButton = document.createElement('button');
modalHeader.appendChild(title);
upperCloseButton.onclick = closeModal;
@@ -41,7 +41,7 @@ function showEditor() {
var ebookTilteLabel = document.createElement('span');
ebookTilteLabel.id = 'chapterEditor-ebookTitleLabel';
- ebookTilteLabel.innerText = 'eBook Title: ';
+ ebookTilteLabel.innerText = chrome.i18n.getMessage('ebookTitleLabel');
titleHolder.appendChild(ebookTilteLabel);
var ebookTilte = document.createElement('input');
@@ -81,12 +81,12 @@ function showEditor() {
var buttons = document.createElement('span');
var previewButton = document.createElement('button');
- previewButton.innerText = 'Raw Preview';
+ previewButton.innerText = chrome.i18n.getMessage('rawPreview');
previewButton.className = 'chapterEditor-text-button';
previewButton.onclick = previewListItem(i);
var removeButton = document.createElement('button');
- removeButton.innerText = 'Remove';
+ removeButton.innerText = chrome.i18n.getMessage('remove');
removeButton.className = 'chapterEditor-text-button chapterEditor-text-red';
removeButton.onclick = removeListItem(i);
@@ -108,16 +108,16 @@ function showEditor() {
// Footer
var buttons = document.createElement('div');
var closeButton = document.createElement('button');
- closeButton.innerText = 'Cancel';
+ closeButton.innerText = chrome.i18n.getMessage('cancel');
closeButton.className = 'chapterEditor-footer-button chapterEditor-float-left chapterEditor-cancel-button';
closeButton.onclick = closeModal;
buttons.appendChild(closeButton);
var removeButton = document.createElement('button');
- removeButton.innerText = 'Remove Chapters';
+ removeButton.innerText = chrome.i18n.getMessage('removeChapters');
removeButton.className = 'chapterEditor-footer-button hapterEditor-float-left';
removeButton.onclick = function() {
- var result = confirm("Do you want to remove all chapters?");
+ var result = confirm(chrome.i18n.getMessage('removeChaptersConfirm'));
if (result) {
removeEbook();
closeModal();
@@ -130,7 +130,7 @@ function showEditor() {
var newChapters = saveChanges();
prepareEbook(newChapters);
};
- saveButton.innerText = 'Generate eBook ...';
+ saveButton.innerText = chrome.i18n.getMessage('generateEbook');
saveButton.className = 'chapterEditor-footer-button chapterEditor-float-right chapterEditor-generate-button';
buttons.appendChild(saveButton);
@@ -138,7 +138,7 @@ function showEditor() {
saveChangesButton.onclick = function() {
saveChanges();
};
- saveChangesButton.innerText = 'Save changes';
+ saveChangesButton.innerText = chrome.i18n.getMessage('saveChanges');
saveChangesButton.className = 'chapterEditor-footer-button chapterEditor-float-right';
buttons.appendChild(saveChangesButton);
@@ -213,7 +213,7 @@ function showEditor() {
function prepareEbook(newChapters) {
try {
if (newChapters.length === 0) {
- alert('Can\'t generate an empty eBook!');
+ alert(chrome.i18n.getMessage('emptyBookWarning'));
return;
}
buildEbookFromChapters();
@@ -236,8 +236,11 @@ function showEditor() {
}
for (var i = 0; i < tmpChaptersList.length; i++) {
- var listIndex = Number(tmpChaptersList[i].id.replace('li', ''));
+ var tmpChapterItem = tmpChaptersList[i];
+ var listIndex = Number(tmpChapterItem.id.replace('li', ''));
if (allPagesRef[listIndex].removed === false) {
+ var newChapterTitle = tmpChapterItem.children.namedItem('text'+listIndex).value;
+ allPagesRef[listIndex].title = newChapterTitle;
newChapters.push(allPagesRef[listIndex]);
}
}
diff --git a/web-extension/cssEditor.css b/web-extension/cssEditor.css
new file mode 100644
index 0000000..88ed70f
--- /dev/null
+++ b/web-extension/cssEditor.css
@@ -0,0 +1,190 @@
+#cssEditor-removeStyle {
+ display: none;
+}
+#cssEditor-saveStyle {
+ display: none;
+}
+#cssEditor-selectStyle {
+ padding: 3px;
+ cursor: pointer;
+ font-size: 15px;
+ font-family: sans-serif;
+}
+#cssEditor-selectStyle > option {
+ padding: 3px;
+ font-size: 1em;
+ cursor: pointer;
+ font-size: 15px;
+ font-family: sans-serif;
+}
+#cssEditor-orLabel {
+ padding: 3px;
+ margin: 0 3px;
+ font-size: 15px;
+ font-family: sans-serif;
+}
+#cssEditor-createNewStyle {
+ padding: 3px;
+ cursor: pointer;
+ font-size: 15px;
+ font-family: sans-serif;
+}
+.cssEditor-field-label-holder {
+ margin-top: 10px;
+ font-size: 15px;
+ font-family: sans-serif;
+ display: flex;
+ justify-content: space-between;
+ width: 90%;
+}
+.cssEditor-field-holder {
+ padding: 3px;
+ width: 90%;
+}
+.cssEditor-field-label {
+ padding: 0 3px;
+ margin-top: 5px;
+}
+
+#cssEditor-styleEditor {
+ display: flex;
+ flex-flow: row;
+}
+
+.cssEditor-left-panel {
+ width: 48%;
+ display: flex;
+ flex-flow: column;
+}
+
+.cssEditor-right-panel {
+ width: 48%;
+ display: flex;
+ flex-flow: column;
+}
+
+#cssEditor-styleName {
+ width: 100%;
+ min-width: 100%;
+ padding: 5px;
+ border: solid rgba(0, 0, 0, 0.25) 1px;
+ font-size: 15px;
+ font-family: sans-serif;
+}
+#cssEditor-matchUrl {
+ width: 100%;
+ min-width: 100%;
+ padding: 5px;
+ border: solid rgba(0, 0, 0, 0.25) 1px;
+ font-size: 15px;
+ font-family: sans-serif;
+}
+#cssEditor-styleContent {
+ width: 100%;
+ height: 150px;
+ padding: 5px;
+ border: solid rgba(0, 0, 0, 0.25) 1px;
+ font-size: 15px;
+ font-family: sans-serif;
+}
+
+#cssEditor-Title {
+ font-size: 20px;
+ font-weight: bold;
+ float: left;
+ display: inline-block;
+ font-family: sans-serif;
+}
+
+#cssEditor-ebookTitleHolder {
+ background-color: #eee;
+ padding: 10px 20px;
+ margin-bottom: 10px;
+}
+
+#cssEditor-modalHeader {
+ display: block;
+ overflow: hidden;
+ padding: 20px;
+}
+#cssEditor-modalList {
+ display: block;
+ padding: 20px;
+ padding-top: 0;
+}
+#cssEditor-modalFooter {
+ display: block;
+ overflow: hidden;
+}
+
+.cssEditor-text-button {
+ border: none;
+ font-size: 15px;
+ font-family: sans-serif;
+ padding: 5px;
+ background-color: rgba(0, 0, 0, 0);
+ margin: 0 3px;
+ outline: none;
+ cursor: pointer;
+}
+.cssEditor-text-button:hover {
+ background-color: #000;
+ color: #fff;
+}
+.cssEditor-text-red {
+ color: red;
+}
+
+.cssEditor-float-left {
+ float: left;
+}
+.cssEditor-float-right {
+ float: right;
+}
+
+.cssEditor-footer-button {
+ padding: 18px 20px;
+ margin: 0;
+ font-size: 18px;
+ border: none;
+ background-color: rgba(0, 0, 0, 0);
+ display: inline-block;
+}
+.cssEditor-footer-button:hover {
+ color: white;
+ background-color: rgba(0, 0, 0, 1);
+ cursor: pointer;
+}
+.cssEditor-save-button {
+ background-color: yellow;
+}
+.cssEditor-cancel-button {
+ /*background-color: black;*/
+}
+
+@media (max-width: 1700px) {
+ .cssEditor-text-button {
+ font-size: 12px;
+ padding: 3px;
+ margin: 0 2px;
+ }
+ .cssEditor-footer-button {
+ padding: 15px 20px;
+ margin: 0;
+ font-size: 15px;
+ border: none;
+ background-color: rgba(0, 0, 0, 0);
+ }
+}
+
+@media (max-width: 1100px) {
+ .cssEditor-chapter-item {
+ line-height: 30px;
+ height: 60px;
+ padding: 4px 0;
+ font-size: 14px;
+ }
+ .cssEditor-chapter-item > input[type="text"] {
+ width: 90%;
+ }
+}
diff --git a/web-extension/cssEditor.js b/web-extension/cssEditor.js
new file mode 100644
index 0000000..ea28993
--- /dev/null
+++ b/web-extension/cssEditor.js
@@ -0,0 +1,379 @@
+for (var i=0; i' + pre.innerText + ''); - }); - $jQueryElement.find('code').each(function (i, pre) { - $(pre).replaceWith('
' + pre.innerText + '');
- });
-}
-
+// tested
function extractMathMl($htmlObject) {
$htmlObject.find('span[id^="MathJax-Element-"]').each(function (i, el) {
$(el).replaceWith('' + el.getAttribute('data-mathml') + '');
});
}
+// tested
function extractCanvasToImg($htmlObject) {
$htmlObject.find('canvas').each(function (index, elem) {
- var tmpXP = getXPath(elem);
- tmpXP = tmpXP.replace(/^\/div\[1\]/m, '/html[1]/body[1]');
- var docEl = lookupElementByXPath(tmpXP);
- var jpegUrl = docEl.toDataURL('image/png');
- $(elem).replaceWith('
');
+ } catch (e) {
+ console.log(e)
+ }
});
}
+// tested
function extractSvgToImg($htmlObject) {
- var serializer = new XMLSerializer();
+ let serializer = new XMLSerializer();
$htmlObject.find('svg').each(function (index, elem) {
- var svgXml = serializer.serializeToString(elem);
- var imgSrc = 'data:image/svg+xml;base64,' + window.btoa(svgXml);
- $(elem).replaceWith('' + $wdirty.html() + '
';
-
- var results = '';
- var lastFragment = '';
- var lastTag = '';
-
- HTMLParser(dirty, {
+ HTMLParser(rawContentString, {
start: function(tag, attrs, unary) {
lastTag = tag;
if (allowedTags.indexOf(tag) < 0) {
return;
}
- var tattrs = null;
if (tag === 'img') {
- tattrs = attrs.filter(function(attr) {
- return attr.name === 'src';
- }).map(function(attr) {
- return getImageSrc(attr.value);
- });
- lastFragment = tattrs.length === 0 ? '' + tmp.innerHTML + '
';
- return sanitize(dirty);
+ let tmpHtml = '' + tmp.innerHTML + '
';
+ return parseHTML(tmpHtml);
} catch (e) {
console.log('Error:', e);
- return '';
+ return htmlContent;
}
}
/////
-function getPageUrl(url) {
- return url.toLowerCase().replace(/\s+/g,'_').replace(/[^a-z0-9_]/g,'') + Math.floor(Math.random() * 10000) + '.xhtml';
-}
-
-function getPageTitle(title) {
- if (title.trim().length === 0) {
- return 'ebook';
- }
- return title;
-}
-
function getSelectedNodes() {
// if (document.selection) {
// return document.selection.createRange().parentElement();
// return document.selection.createRange();
// }
- var selection = window.getSelection();
- var docfrag = [];
- for (var i = 0; i < selection.rangeCount; i++) {
+ let selection = window.getSelection();
+ let docfrag = [];
+ for (let i = 0; i < selection.rangeCount; i++) {
docfrag.push(selection.getRangeAt(i).cloneContents());
}
return docfrag;
@@ -263,66 +295,174 @@ function getSelectedNodes() {
/////
+function extractCss(includeStyle, appliedStyles) {
+ if (includeStyle) {
+ $('body').find('*').each((i, pre) => {
+ let $pre = $(pre);
+
+ if (allowedTags.indexOf(pre.tagName.toLowerCase()) < 0) return;
+ if (mathMLTags.indexOf(pre.tagName.toLowerCase()) > -1) return;
+
+ if (!$pre.is(':visible')) {
+ $pre.replaceWith('');
+ } else {
+ if (pre.tagName.toLowerCase() === 'svg') return;
+
+ let classNames = pre.getAttribute('class');
+ if (!classNames) {
+ classNames = pre.getAttribute('id');
+ if (!classNames) {
+ classNames = pre.tagName + '-' + generateRandomNumber();
+ }
+ }
+ let tmpName = cssClassesToTmpIds[classNames];
+ let tmpNewCss = tmpIdsToNewCss[tmpName];
+ if (!tmpName) {
+ // TODO - collision between class names when multiple pages
+ tmpName = generateRandomTag(2) + i
+ cssClassesToTmpIds[classNames] = tmpName;
+ }
+ if (!tmpNewCss) {
+ tmpNewCss = {};
+
+ for (let cssTagName of supportedCss) {
+ let cssValue = $pre.css(cssTagName);
+ if (cssValue && cssValue.length > 0) {
+ tmpNewCss[cssTagName] = cssValue;
+ }
+ }
+
+ // Reuse CSS - if the same css code was generated for another element, reuse it's class name
+
+ let tcss = JSON.stringify(tmpNewCss)
+ let found = false
+
+ if (Object.keys(tmpIdsToNewCssSTRING).length === 0) {
+ tmpIdsToNewCssSTRING[tmpName] = tcss;
+ tmpIdsToNewCss[tmpName] = tmpNewCss;
+ } else {
+ for (const key in tmpIdsToNewCssSTRING) {
+ if (tmpIdsToNewCssSTRING[key] === tcss) {
+ tmpName = key
+ found = true
+ break
+ }
+ }
+ if (!found) {
+ tmpIdsToNewCssSTRING[tmpName] = tcss;
+ tmpIdsToNewCss[tmpName] = tmpNewCss;
+ }
+ }
+ }
+ pre.setAttribute('data-class', tmpName);
+ }
+ });
+ return jsonToCss(tmpIdsToNewCss);
+ } else {
+ // remove hidden elements when style is not included
+ $('body').find('*').each((i, pre) => {
+ let $pre = $(pre)
+ if (!$pre.is(':visible')) {
+ $pre.replaceWith('')
+ }
+ })
+ let mergedCss = '';
+ if (appliedStyles && appliedStyles.length > 0) {
+ for (let i = 0; i < appliedStyles.length; i++) {
+ mergedCss += appliedStyles[i].style;
+ }
+ return mergedCss;
+ }
+ }
+ return null
+}
+
+/////
+
function deferredAddZip(url, filename) {
- var deferred = $.Deferred();
- JSZipUtils.getBinaryContent(url, function(err, data) {
+ let deferred = $.Deferred();
+ JSZipUtils.getBinaryContent(url, function(err, data) {
if (err) {
// deferred.reject(err); TODO
console.log('Error:', err);
deferred.resolve();
} else {
+ // TODO - move to utils.js
+ if (filename.endsWith("TODO-EXTRACT")) {
+ let oldFilename = filename
+ let arr = (new Uint8Array(data)).subarray(0, 4);
+ let header = "";
+ for(let i = 0; i < arr.length; i++) {
+ header += arr[i].toString(16);
+ }
+ if (header.startsWith("89504e47")) {
+ filename = filename.replace("TODO-EXTRACT", "png")
+ } else if (header.startsWith("47494638")) {
+ filename = filename.replace("TODO-EXTRACT", "gif")
+ } else if (header.startsWith("ffd8ff")) {
+ filename = filename.replace("TODO-EXTRACT", "jpg")
+ } else {
+ // ERROR
+ console.log("Error! Unable to extract the image type!");
+ deferred.resolve();
+ }
+ tmpGlobalContent = tmpGlobalContent.replace(oldFilename, filename)
+ }
+
extractedImages.push({
filename: filename,
+ // TODO - must be JSON serializable
data: base64ArrayBuffer(data)
});
+
deferred.resolve();
}
});
return deferred;
}
-chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
- var imgsPromises = [];
- var result = {};
- var pageSrc = '';
- var tmpContent = '';
+chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+ let imgsPromises = [];
+ let result = {};
+ let pageSrc = '';
+ let tmpContent = '';
+ let styleFile = null;
+
+ extractIFrames()
if (request.type === 'extract-page') {
+ styleFile = extractCss(request.includeStyle, request.appliedStyles)
pageSrc = document.getElementsByTagName('body')[0];
tmpContent = getContent(pageSrc);
} else if (request.type === 'extract-selection') {
+ styleFile = extractCss(request.includeStyle, request.appliedStyles)
pageSrc = getSelectedNodes();
- pageSrc.forEach(function (page) {
+ pageSrc.forEach((page) => {
tmpContent += getContent(page);
});
- } else if (request.type === 'echo') {
- sendResponse({
- echo: true
- });
- return;
}
- if (tmpContent.trim() === '') {
- sendResponse('');
- return;
- }
+ tmpGlobalContent = tmpContent
- allImages.forEach(function (tmpImg) {
+ allImages.forEach((tmpImg) => {
imgsPromises.push(deferredAddZip(tmpImg.originalUrl, tmpImg.filename));
});
- $.when.apply($, imgsPromises).done(function() {
- var tmpTitle = getPageTitle(document.title);
+ $.when.apply($, imgsPromises).done(() => {
+ let tmpTitle = getPageTitle(document.title);
result = {
url: getPageUrl(tmpTitle),
title: tmpTitle,
baseUrl: getCurrentUrl(),
+ styleFileContent: styleFile,
+ styleFileName: 'style' + generateRandomNumber() + '.css',
images: extractedImages,
- content: tmpContent
+ content: tmpGlobalContent
};
sendResponse(result);
- }).fail(function(e) {
+ }).fail((e) => {
console.log('Error:', e);
+ sendResponse(null)
});
return true;
diff --git a/web-extension/filesaver.js b/web-extension/filesaver.js
deleted file mode 100644
index 239db12..0000000
--- a/web-extension/filesaver.js
+++ /dev/null
@@ -1,188 +0,0 @@
-/* FileSaver.js
- * A saveAs() FileSaver implementation.
- * 1.3.2
- * 2016-06-16 18:25:19
- *
- * By Eli Grey, http://eligrey.com
- * License: MIT
- * See https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md
- */
-
-/*global self */
-/*jslint bitwise: true, indent: 4, laxbreak: true, laxcomma: true, smarttabs: true, plusplus: true */
-
-/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
-
-var saveAs = saveAs || (function(view) {
- "use strict";
- // IE <10 is explicitly unsupported
- if (typeof view === "undefined" || typeof navigator !== "undefined" && /MSIE [1-9]\./.test(navigator.userAgent)) {
- return;
- }
- var
- doc = view.document
- // only get URL when necessary in case Blob.js hasn't overridden it yet
- , get_URL = function() {
- return view.URL || view.webkitURL || view;
- }
- , save_link = doc.createElementNS("http://www.w3.org/1999/xhtml", "a")
- , can_use_save_link = "download" in save_link
- , click = function(node) {
- var event = new MouseEvent("click");
- node.dispatchEvent(event);
- }
- , is_safari = /constructor/i.test(view.HTMLElement)
- , is_chrome_ios =/CriOS\/[\d]+/.test(navigator.userAgent)
- , throw_outside = function(ex) {
- (view.setImmediate || view.setTimeout)(function() {
- throw ex;
- }, 0);
- }
- , force_saveable_type = "application/octet-stream"
- // the Blob API is fundamentally broken as there is no "downloadfinished" event to subscribe to
- , arbitrary_revoke_timeout = 1000 * 40 // in ms
- , revoke = function(file) {
- var revoker = function() {
- if (typeof file === "string") { // file is an object URL
- get_URL().revokeObjectURL(file);
- } else { // file is a File
- file.remove();
- }
- };
- setTimeout(revoker, arbitrary_revoke_timeout);
- }
- , dispatch = function(filesaver, event_types, event) {
- event_types = [].concat(event_types);
- var i = event_types.length;
- while (i--) {
- var listener = filesaver["on" + event_types[i]];
- if (typeof listener === "function") {
- try {
- listener.call(filesaver, event || filesaver);
- } catch (ex) {
- throw_outside(ex);
- }
- }
- }
- }
- , auto_bom = function(blob) {
- // prepend BOM for UTF-8 XML and text/* types (including HTML)
- // note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
- if (/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
- return new Blob([String.fromCharCode(0xFEFF), blob], {type: blob.type});
- }
- return blob;
- }
- , FileSaver = function(blob, name, no_auto_bom) {
- if (!no_auto_bom) {
- blob = auto_bom(blob);
- }
- // First try a.download, then web filesystem, then object URLs
- var
- filesaver = this
- , type = blob.type
- , force = type === force_saveable_type
- , object_url
- , dispatch_all = function() {
- dispatch(filesaver, "writestart progress write writeend".split(" "));
- }
- // on any filesys errors revert to saving with object URLs
- , fs_error = function() {
- if ((is_chrome_ios || (force && is_safari)) && view.FileReader) {
- // Safari doesn't allow downloading of blob urls
- var reader = new FileReader();
- reader.onloadend = function() {
- var url = is_chrome_ios ? reader.result : reader.result.replace(/^data:[^;]*;/, 'data:attachment/file;');
- var popup = view.open(url, '_blank');
- if(!popup) view.location.href = url;
- url=undefined; // release reference before dispatching
- filesaver.readyState = filesaver.DONE;
- dispatch_all();
- };
- reader.readAsDataURL(blob);
- filesaver.readyState = filesaver.INIT;
- return;
- }
- // don't create more object URLs than needed
- if (!object_url) {
- object_url = get_URL().createObjectURL(blob);
- }
- if (force) {
- view.location.href = object_url;
- } else {
- var opened = view.open(object_url, "_blank");
- if (!opened) {
- // Apple does not allow window.open, see https://developer.apple.com/library/safari/documentation/Tools/Conceptual/SafariExtensionGuide/WorkingwithWindowsandTabs/WorkingwithWindowsandTabs.html
- view.location.href = object_url;
- }
- }
- filesaver.readyState = filesaver.DONE;
- dispatch_all();
- revoke(object_url);
- }
- ;
- filesaver.readyState = filesaver.INIT;
-
- if (can_use_save_link) {
- object_url = get_URL().createObjectURL(blob);
- setTimeout(function() {
- save_link.href = object_url;
- save_link.download = name;
- click(save_link);
- dispatch_all();
- revoke(object_url);
- filesaver.readyState = filesaver.DONE;
- });
- return;
- }
-
- fs_error();
- }
- , FS_proto = FileSaver.prototype
- , saveAs = function(blob, name, no_auto_bom) {
- return new FileSaver(blob, name || blob.name || "download", no_auto_bom);
- }
- ;
- // IE 10+ (native saveAs)
- if (typeof navigator !== "undefined" && navigator.msSaveOrOpenBlob) {
- return function(blob, name, no_auto_bom) {
- name = name || blob.name || "download";
-
- if (!no_auto_bom) {
- blob = auto_bom(blob);
- }
- return navigator.msSaveOrOpenBlob(blob, name);
- };
- }
-
- FS_proto.abort = function(){};
- FS_proto.readyState = FS_proto.INIT = 0;
- FS_proto.WRITING = 1;
- FS_proto.DONE = 2;
-
- FS_proto.error =
- FS_proto.onwritestart =
- FS_proto.onprogress =
- FS_proto.onwrite =
- FS_proto.onabort =
- FS_proto.onerror =
- FS_proto.onwriteend =
- null;
-
- return saveAs;
-}(
- typeof self !== "undefined" && self
- || typeof window !== "undefined" && window
- || this.content
-));
-// `self` is undefined in Firefox for Android content script context
-// while `this` is nsIContentFrameMessageManager
-// with an attribute `content` that corresponds to the window
-
-if (typeof module !== "undefined" && module.exports) {
- module.exports.saveAs = saveAs;
-} else if ((typeof define !== "undefined" && define !== null) && (define.amd !== null)) {
- define([], function() {
- return saveAs;
- });
-}
diff --git a/web-extension/icons/book128.png b/web-extension/icons/book128.png
index 3b5d8fd..14ae99c 100644
Binary files a/web-extension/icons/book128.png and b/web-extension/icons/book128.png differ
diff --git a/web-extension/icons/book32.png b/web-extension/icons/book32.png
index 81d30eb..84ee1f9 100644
Binary files a/web-extension/icons/book32.png and b/web-extension/icons/book32.png differ
diff --git a/web-extension/icons/book48.png b/web-extension/icons/book48.png
index ada2f39..d06befb 100644
Binary files a/web-extension/icons/book48.png and b/web-extension/icons/book48.png differ
diff --git a/web-extension/libs/cssjson.js b/web-extension/libs/cssjson.js
new file mode 100644
index 0000000..01b6332
--- /dev/null
+++ b/web-extension/libs/cssjson.js
@@ -0,0 +1,297 @@
+/**
+ * CSS-JSON Converter for JavaScript
+ * Converts CSS to JSON and back.
+ * Version 2.1
+ *
+ * Released under the MIT license.
+ *
+ * Copyright (c) 2013 Aram Kocharyan, http://aramk.com/
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions
+ of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+var CSSJSON = new function () {
+
+ var base = this;
+
+ base.init = function () {
+ // String functions
+ String.prototype.trim = function () {
+ return this.replace(/^\s+|\s+$/g, '');
+ };
+
+ String.prototype.repeat = function (n) {
+ return new Array(1 + n).join(this);
+ };
+ };
+ base.init();
+
+ var selX = /([^\s\;\{\}][^\;\{\}]*)\{/g;
+ var endX = /\}/g;
+ var lineX = /([^\;\{\}]*)\;/g;
+ var commentX = /\/\*[\s\S]*?\*\//g;
+ var lineAttrX = /([^\:]+):([^\;]*);/;
+
+ // This is used, a concatenation of all above. We use alternation to
+ // capture.
+ var altX = /(\/\*[\s\S]*?\*\/)|([^\s\;\{\}][^\;\{\}]*(?=\{))|(\})|([^\;\{\}]+\;(?!\s*\*\/))/gmi;
+
+ // Capture groups
+ var capComment = 1;
+ var capSelector = 2;
+ var capEnd = 3;
+ var capAttr = 4;
+
+ var isEmpty = function (x) {
+ return typeof x == 'undefined' || x.length == 0 || x == null;
+ };
+
+ var isCssJson = function (node) {
+ return !isEmpty(node) ? (node.attributes && node.children) : false;
+ }
+
+ /**
+ * Input is css string and current pos, returns JSON object
+ *
+ * @param cssString
+ * The CSS string.
+ * @param args
+ * An optional argument object. ordered: Whether order of
+ * comments and other nodes should be kept in the output. This
+ * will return an object where all the keys are numbers and the
+ * values are objects containing "name" and "value" keys for each
+ * node. comments: Whether to capture comments. split: Whether to
+ * split each comma separated list of selectors.
+ */
+ base.toJSON = function (cssString, args) {
+ var node = {
+ children: {},
+ attributes: {}
+ };
+ var match = null;
+ var count = 0;
+
+ if (typeof args == 'undefined') {
+ var args = {
+ ordered: false,
+ comments: false,
+ stripComments: false,
+ split: false
+ };
+ }
+ if (args.stripComments) {
+ args.comments = false;
+ cssString = cssString.replace(commentX, '');
+ }
+
+ while ((match = altX.exec(cssString)) != null) {
+ if (!isEmpty(match[capComment]) && args.comments) {
+ // Comment
+ var add = match[capComment].trim();
+ node[count++] = add;
+ } else if (!isEmpty(match[capSelector])) {
+ // New node, we recurse
+ var name = match[capSelector].trim();
+ // This will return when we encounter a closing brace
+ var newNode = base.toJSON(cssString, args);
+ if (args.ordered) {
+ var obj = {};
+ obj['name'] = name;
+ obj['value'] = newNode;
+ // Since we must use key as index to keep order and not
+ // name, this will differentiate between a Rule Node and an
+ // Attribute, since both contain a name and value pair.
+ obj['type'] = 'rule';
+ node[count++] = obj;
+ } else {
+ if (args.split) {
+ var bits = name.split(',');
+ } else {
+ var bits = [name];
+ }
+ for (i in bits) {
+ var sel = bits[i].trim();
+ if (sel in node.children) {
+ for (var att in newNode.attributes) {
+ node.children[sel].attributes[att] = newNode.attributes[att];
+ }
+ } else {
+ node.children[sel] = newNode;
+ }
+ }
+ }
+ } else if (!isEmpty(match[capEnd])) {
+ // Node has finished
+ return node;
+ } else if (!isEmpty(match[capAttr])) {
+ var line = match[capAttr].trim();
+ var attr = lineAttrX.exec(line);
+ if (attr) {
+ // Attribute
+ var name = attr[1].trim();
+ var value = attr[2].trim();
+ if (args.ordered) {
+ var obj = {};
+ obj['name'] = name;
+ obj['value'] = value;
+ obj['type'] = 'attr';
+ node[count++] = obj;
+ } else {
+ if (name in node.attributes) {
+ var currVal = node.attributes[name];
+ if (!(currVal instanceof Array)) {
+ node.attributes[name] = [currVal];
+ }
+ node.attributes[name].push(value);
+ } else {
+ node.attributes[name] = value;
+ }
+ }
+ } else {
+ // Semicolon terminated line
+ node[count++] = line;
+ }
+ }
+ }
+
+ return node;
+ };
+
+ /**
+ * @param node
+ * A JSON node.
+ * @param depth
+ * The depth of the current node; used for indentation and
+ * optional.
+ * @param breaks
+ * Whether to add line breaks in the output.
+ */
+ base.toCSS = function (node, depth, breaks) {
+ var cssString = '';
+ if (typeof depth == 'undefined') {
+ depth = 0;
+ }
+ if (typeof breaks == 'undefined') {
+ breaks = false;
+ }
+ if (node.attributes) {
+ for (i in node.attributes) {
+ var att = node.attributes[i];
+ if (att instanceof Array) {
+ for (var j = 0; j < att.length; j++) {
+ cssString += strAttr(i, att[j], depth);
+ }
+ } else {
+ cssString += strAttr(i, att, depth);
+ }
+ }
+ }
+ if (node.children) {
+ var first = true;
+ for (i in node.children) {
+ if (breaks && !first) {
+ cssString += '\n';
+ } else {
+ first = false;
+ }
+ cssString += strNode(i, node.children[i], depth);
+ }
+ }
+ return cssString;
+ };
+
+ /**
+ * @param data
+ * You can pass css string or the CSSJS.toJSON return value.
+ * @param id (Optional)
+ * To identify and easy removable of the style element
+ * @param replace (Optional. defaults to TRUE)
+ * Whether to remove or simply do nothing
+ * @return HTMLLinkElement
+ */
+ base.toHEAD = function (data, id, replace) {
+ var head = document.getElementsByTagName('head')[0];
+ var xnode = document.getElementById(id);
+ var _xnodeTest = (xnode !== null && xnode instanceof HTMLStyleElement);
+
+ if (isEmpty(data) || !(head instanceof HTMLHeadElement)) return;
+ if (_xnodeTest) {
+ if (replace === true || isEmpty(replace)) {
+ xnode.removeAttribute('id');
+ } else return;
+ }
+ if (isCssJson(data)) {
+ data = base.toCSS(data);
+ }
+
+ var node = document.createElement('style');
+ node.type = 'text/css';
+
+ if (!isEmpty(id)) {
+ node.id = id;
+ } else {
+ node.id = 'cssjson_' + timestamp();
+ }
+ if (node.styleSheet) {
+ node.styleSheet.cssText = data;
+ } else {
+ node.appendChild(document.createTextNode(data));
+ }
+
+ head.appendChild(node);
+
+ if (isValidStyleNode(node)) {
+ if (_xnodeTest) {
+ xnode.parentNode.removeChild(xnode);
+ }
+ } else {
+ node.parentNode.removeChild(node);
+ if (_xnodeTest) {
+ xnode.setAttribute('id', id);
+ node = xnode;
+ } else return;
+ }
+
+ return node;
+ };
+
+ // Alias
+
+ if (typeof window != 'undefined') {
+ window.createCSS = base.toHEAD;
+ }
+
+ // Helpers
+
+ var isValidStyleNode = function (node) {
+ return (node instanceof HTMLStyleElement) && node.sheet.cssRules.length > 0;
+ }
+
+ var timestamp = function () {
+ return Date.now() || +new Date();
+ };
+
+ var strAttr = function (name, value, depth) {
+ return '\t'.repeat(depth) + name + ': ' + value + ';\n';
+ };
+
+ var strNode = function (name, value, depth) {
+ var cssString = '\t'.repeat(depth) + name + ' {\n';
+ cssString += base.toCSS(value, depth + 1);
+ cssString += '\t'.repeat(depth) + '}\n';
+ return cssString;
+ };
+
+};
diff --git a/web-extension/libs/filesaver.js b/web-extension/libs/filesaver.js
new file mode 100644
index 0000000..5d204ae
--- /dev/null
+++ b/web-extension/libs/filesaver.js
@@ -0,0 +1,171 @@
+/*
+* FileSaver.js
+* A saveAs() FileSaver implementation.
+*
+* By Eli Grey, http://eligrey.com
+*
+* License : https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md (MIT)
+* source : http://purl.eligrey.com/github/FileSaver.js
+*/
+
+// The one and only way of getting global scope in all environments
+// https://stackoverflow.com/q/3277182/1008999
+var _global = typeof window === 'object' && window.window === window
+ ? window : typeof self === 'object' && self.self === self
+ ? self : typeof global === 'object' && global.global === global
+ ? global
+ : this
+
+function bom (blob, opts) {
+ if (typeof opts === 'undefined') opts = { autoBom: false }
+ else if (typeof opts !== 'object') {
+ console.warn('Deprecated: Expected third argument to be a object')
+ opts = { autoBom: !opts }
+ }
+
+ // prepend BOM for UTF-8 XML and text/* types (including HTML)
+ // note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
+ if (opts.autoBom && /^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
+ return new Blob([String.fromCharCode(0xFEFF), blob], { type: blob.type })
+ }
+ return blob
+}
+
+function download (url, name, opts) {
+ var xhr = new XMLHttpRequest()
+ xhr.open('GET', url)
+ xhr.responseType = 'blob'
+ xhr.onload = function () {
+ saveAs(xhr.response, name, opts)
+ }
+ xhr.onerror = function () {
+ console.error('could not download file')
+ }
+ xhr.send()
+}
+
+function corsEnabled (url) {
+ var xhr = new XMLHttpRequest()
+ // use sync to avoid popup blocker
+ xhr.open('HEAD', url, false)
+ try {
+ xhr.send()
+ } catch (e) {}
+ return xhr.status >= 200 && xhr.status <= 299
+}
+
+// `a.click()` doesn't work for all browsers (#465)
+function click (node) {
+ try {
+ node.dispatchEvent(new MouseEvent('click'))
+ } catch (e) {
+ var evt = document.createEvent('MouseEvents')
+ evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80,
+ 20, false, false, false, false, 0, null)
+ node.dispatchEvent(evt)
+ }
+}
+
+// Detect WebView inside a native macOS app by ruling out all browsers
+// We just need to check for 'Safari' because all other browsers (besides Firefox) include that too
+// https://www.whatismybrowser.com/guides/the-latest-user-agent/macos
+var isMacOSWebView = _global.navigator && /Macintosh/.test(navigator.userAgent) && /AppleWebKit/.test(navigator.userAgent) && !/Safari/.test(navigator.userAgent)
+
+var saveAs = _global.saveAs || (
+ // probably in some web worker
+ (typeof window !== 'object' || window !== _global)
+ ? function saveAs () { /* noop */ }
+
+ // Use download attribute first if possible (#193 Lumia mobile) unless this is a macOS WebView
+ : ('download' in HTMLAnchorElement.prototype && !isMacOSWebView)
+ ? function saveAs (blob, name, opts) {
+ var URL = _global.URL || _global.webkitURL
+ var a = document.createElement('a')
+ name = name || blob.name || 'download'
+
+ a.download = name
+ a.rel = 'noopener' // tabnabbing
+
+ // TODO: detect chrome extensions & packaged apps
+ // a.target = '_blank'
+
+ if (typeof blob === 'string') {
+ // Support regular links
+ a.href = blob
+ if (a.origin !== location.origin) {
+ corsEnabled(a.href)
+ ? download(blob, name, opts)
+ : click(a, a.target = '_blank')
+ } else {
+ click(a)
+ }
+ } else {
+ // Support blobs
+ a.href = URL.createObjectURL(blob)
+ setTimeout(function () { URL.revokeObjectURL(a.href) }, 4E4) // 40s
+ setTimeout(function () { click(a) }, 0)
+ }
+ }
+
+ // Use msSaveOrOpenBlob as a second approach
+ : 'msSaveOrOpenBlob' in navigator
+ ? function saveAs (blob, name, opts) {
+ name = name || blob.name || 'download'
+
+ if (typeof blob === 'string') {
+ if (corsEnabled(blob)) {
+ download(blob, name, opts)
+ } else {
+ var a = document.createElement('a')
+ a.href = blob
+ a.target = '_blank'
+ setTimeout(function () { click(a) })
+ }
+ } else {
+ navigator.msSaveOrOpenBlob(bom(blob, opts), name)
+ }
+ }
+
+ // Fallback to using FileReader and a popup
+ : function saveAs (blob, name, opts, popup) {
+ // Open a popup immediately do go around popup blocker
+ // Mostly only available on user interaction and the fileReader is async so...
+ popup = popup || open('', '_blank')
+ if (popup) {
+ popup.document.title =
+ popup.document.body.innerText = 'downloading...'
+ }
+
+ if (typeof blob === 'string') return download(blob, name, opts)
+
+ var force = blob.type === 'application/octet-stream'
+ var isSafari = /constructor/i.test(_global.HTMLElement) || _global.safari
+ var isChromeIOS = /CriOS\/[\d]+/.test(navigator.userAgent)
+
+ if ((isChromeIOS || (force && isSafari) || isMacOSWebView) && typeof FileReader !== 'undefined') {
+ // Safari doesn't allow downloading of blob URLs
+ var reader = new FileReader()
+ reader.onloadend = function () {
+ var url = reader.result
+ url = isChromeIOS ? url : url.replace(/^data:[^;]*;/, 'data:attachment/file;')
+ if (popup) popup.location.href = url
+ else location = url
+ popup = null // reverse-tabnabbing #460
+ }
+ reader.readAsDataURL(blob)
+ } else {
+ var URL = _global.URL || _global.webkitURL
+ var url = URL.createObjectURL(blob)
+ if (popup) popup.location = url
+ else location.href = url
+ popup = null // reverse-tabnabbing #460
+ setTimeout(function () { URL.revokeObjectURL(url) }, 4E4) // 40s
+ }
+ }
+)
+
+_global.saveAs = saveAs.saveAs = saveAs
+
+if (typeof module !== 'undefined') {
+ module.exports = saveAs;
+}
diff --git a/web-extension/jquery-sortable.js b/web-extension/libs/jquery-sortable.js
similarity index 100%
rename from web-extension/jquery-sortable.js
rename to web-extension/libs/jquery-sortable.js
diff --git a/web-extension/jquery.js b/web-extension/libs/jquery.js
similarity index 100%
rename from web-extension/jquery.js
rename to web-extension/libs/jquery.js
diff --git a/web-extension/jszip-utils.js b/web-extension/libs/jszip-utils.js
similarity index 100%
rename from web-extension/jszip-utils.js
rename to web-extension/libs/jszip-utils.js
diff --git a/web-extension/jszip.js b/web-extension/libs/jszip.js
similarity index 100%
rename from web-extension/jszip.js
rename to web-extension/libs/jszip.js
diff --git a/web-extension/pure-parser.js b/web-extension/libs/pure-parser.js
similarity index 100%
rename from web-extension/pure-parser.js
rename to web-extension/libs/pure-parser.js
diff --git a/web-extension/manifest.json b/web-extension/manifest.json
index 47a8a46..0b65008 100644
--- a/web-extension/manifest.json
+++ b/web-extension/manifest.json
@@ -1,7 +1,8 @@
{
"manifest_version": 2,
- "name": "Save As eBook",
- "version": "1.1",
+ "name": "__MSG_extName__",
+ "version": "1.4.2",
+ "default_locale": "en",
"author": "Alex Adam",
"homepage_url": "https://github.com/alexadam/save-as-ebook",
"description": "Save a web page or selection as eBook (.epub)",
@@ -10,7 +11,9 @@
},
"content_scripts": [{
"matches": ["
-
-
+
+ ' +
allPages.reduce(function(prev, page, index) {
+ var tmpPageTitle = escapeXMLChars(page.title);
return prev + '\n' +
'' +
- '' + page.title + ' ' + tmpPageTitle + ' ';
}, '') +
@@ -98,16 +116,21 @@ function _buildEbook(allPages) {
''
);
- oebps.file(cssFileName, '');
+ oebps.file(cssFileName, ''); //TODO
+ var styleFolder = oebps.folder('style');
+ allPages.forEach(function(page) {
+ styleFolder.file(page.styleFileName, page.styleFileContent);
+ });
var pagesFolder = oebps.folder('pages');
allPages.forEach(function(page) {
+ var tmpPageTitle = escapeXMLChars(page.title);
pagesFolder.file(page.url,
'' +
'' +
'' +
- '' + page.title + ' ' +
- '' +
+ '' + tmpPageTitle+ ' ' +
+ '' +
'' +
page.content +
''
@@ -120,7 +143,7 @@ function _buildEbook(allPages) {
'' +
''+ ebookName + ' ' +
'isbn ' +
- '' + new Date().toISOString() + '' +
+ '' + new Date().toISOString().replace(/\.[0-9]+Z/i, 'Z') + '' +
'en ' +
' ' +
'' +
@@ -130,10 +153,12 @@ function _buildEbook(allPages) {
allPages.reduce(function(prev, page, index) {
return prev + '\n' + ' ' +
'' +
allPages.reduce(function(prev, page, index) {
@@ -144,37 +169,35 @@ function _buildEbook(allPages) {
);
///////////////
- var imgsFolder = oebps.folder("images");
- allPages.forEach(function(page) {
- for (var i = 0; i < page.images.length; i++) {
- var tmpImg = page.images[i];
- imgsFolder.file(tmpImg.filename, tmpImg.data, {
- base64: true
- });
- }
- });
-
- var done = false;
+ try {
+ let imgsFolder = oebps.folder("images");
+ allPages.forEach(function(page) {
+ for (let i = 0; i < page.images.length; i++) {
+ let tmpImg = page.images[i]
+ // TODO - Must be JSON serializable - see the same comment in extractHtml.js
+ // if (tmpImg.isBinary) {
+ // imgsFolder.file(tmpImg.filename, tmpImg.data, {binary: true})
+ // } else {
+ imgsFolder.file(tmpImg.filename, tmpImg.data, {base64: true})
+ // }
+ }
+ });
+ } catch (error) {
+ console.log(error);
+ }
+
zip.generateAsync({
- type: "blob"
+ type: "blob",
+ mimeType: "application/epub+zip"
})
.then(function(content) {
- done = true;
console.log("done !");
- saveAs(content, ebookName);
+ saveAs(content, ebookFileName);
+
+ chrome.runtime.sendMessage({
+ type: "done"
+ }, (response) => {});
});
- setTimeout(function() {
- if (done) {
- return;
- }
- zip.generateAsync({
- type: "blob"
- })
- .then(function(content) {
- saveAs(content, ebookName);
- });
- }, 60000);
-
}
diff --git a/web-extension/selector.js b/web-extension/selector.js
new file mode 100644
index 0000000..39b84e9
--- /dev/null
+++ b/web-extension/selector.js
@@ -0,0 +1,140 @@
+var lastTargetElem = null
+var lastElementData = {}
+var lastParentElem = null
+var lastParentData = {}
+
+let cleanXPaths = []
+
+
+let bodyElem = document.getElementsByTagName('body')[0]
+let bodyInner = bodyElem.innerHTML
+bodyElem.innerHTML = ''
+
+// let container = document.createElement('div')
+// container.style.display = "flex"
+// container.style.flexFlow = "row"
+// let menuContainer = document.createElement('div')
+// menuContainer.style.width = '300px'
+// menuContainer.style.minWidth = '300px'
+// menuContainer.style.height = '600px'
+// menuContainer.style.minHeight = '600px'
+// let page = document.createElement('div')
+// page.id= 'super-selector'
+// page.style.width = '90%'
+// page.style.height = '90%'
+// page.innerHTML = bodyInner
+
+// let menu = document.createElement('div')
+// menu.id = "slector-main-menu"
+// menu.style.width = '300px'
+// menu.style.minWidth = '300px'
+// menu.style.height = '600px'
+// menu.style.minHeight = '600px'
+// menu.style.backgroundColor = 'black'
+// menu.style.position = 'fixed'
+// menu.style.top = '0'
+
+
+// container.appendChild(menuContainer)
+// container.appendChild(page)
+// bodyElem.appendChild(container)
+// bodyElem.appendChild(menu)
+
+bodyElem.innerHTML = `
+
+
+
-
-
-
-
-
-
-
+
diff --git a/web-extension/menu.js b/web-extension/menu.js
index 3d18b36..d38dcf2 100644
--- a/web-extension/menu.js
+++ b/web-extension/menu.js
@@ -1,6 +1,137 @@
+var allStyles = [];
+var currentStyle = null;
+var appliedStyles = [];
+
+// create menu labels
+document.getElementById('menuTitle').innerHTML = chrome.i18n.getMessage('extName');
+document.getElementById('includeStyle').innerHTML = chrome.i18n.getMessage('includeStyle');
+document.getElementById('editStyles').innerHTML = chrome.i18n.getMessage('editStyles');
+document.getElementById('savePageLabel').innerHTML = chrome.i18n.getMessage('savePage');
+document.getElementById('saveSelectionLabel').innerHTML = chrome.i18n.getMessage('saveSelection');
+document.getElementById('pageChapterLabel').innerHTML = chrome.i18n.getMessage('pageChapter');
+document.getElementById('selectionChapterLabel').innerHTML = chrome.i18n.getMessage('selectionChapter');
+document.getElementById('editChapters').innerHTML = chrome.i18n.getMessage('editChapters');
+document.getElementById('waitMessage').innerHTML = chrome.i18n.getMessage('waitMessage');
+
+function removeEbook() {
+ chrome.runtime.sendMessage({
+ type: "remove"
+ }, function(response) {});
+}
+
+chrome.runtime.sendMessage({
+ type: "is busy?"
+}, function(response) {
+ if (response.isBusy) {
+ document.getElementById('busy').style.display = 'block';
+ } else {
+ document.getElementById('busy').style.display = 'none';
+ }
+});
+
+chrome.runtime.sendMessage({
+ type: "get styles"
+}, function(response) {
+ createStyleList(response.styles);
+});
+
+function createStyleList(styles) {
+ allStyles = styles;
+ chrome.tabs.query({'active': true}, function (tabs) {
+ let currentUrl = tabs[0].url;
+
+ if (!styles || styles.length === 0) {
+ return;
+ }
+
+ let foundMatchingUrl = false;
+
+ // if multiple URL regexes match, select the longest one
+ let allMatchingStyles = [];
+
+ for (let i = 0; i < styles.length; i++) {
+ let listItem = document.createElement('option');
+ listItem.id = 'option_' + i;
+ listItem.className = 'cssEditor-chapter-item';
+ listItem.value = 'option_' + i;
+ listItem.innerText = styles[i].title;
+
+ currentUrl = currentUrl.replace(/(http[s]?:\/\/|www\.)/i, '').toLowerCase();
+ let styleUrl = styles[i].url;
+ let styleUrlRegex = null;
+
+ try {
+ styleUrlRegex = new RegExp(styleUrl, 'i');
+ } catch (e) {
+ }
+
+ if (styleUrlRegex && styleUrlRegex.test(currentUrl)) {
+ allMatchingStyles.push({
+ index: i,
+ length: styleUrl.length
+ });
+ }
+ }
+
+ if (allMatchingStyles.length >= 1) {
+ allMatchingStyles.sort(function (a, b) {
+ return b.length - a.length;
+ });
+ let selStyle = allMatchingStyles[0];
+ currentStyle = styles[selStyle.index];
+
+ chrome.runtime.sendMessage({
+ type: "set current style",
+ currentStyle: currentStyle
+ }, function(response) {
+ });
+ }
+ });
+}
+
+function createIncludeStyle(data) {
+ let includeStyleCheck = document.getElementById('includeStyleCheck');
+ includeStyleCheck.checked = data;
+}
+
+chrome.runtime.sendMessage({
+ type: "get include style"
+}, function(response) {
+ createIncludeStyle(response.includeStyle);
+});
+
+document.getElementById('includeStyleCheck').onclick = function () {
+ let includeStyleCheck = document.getElementById('includeStyleCheck');
+ chrome.runtime.sendMessage({
+ type: "set include style",
+ includeStyle: includeStyleCheck.checked
+ }, function(response) {
+ });
+}
+
+document.getElementById("editStyles").onclick = function() {
+
+ if (document.getElementById('cssEditor-Modal')) {
+ return;
+ }
+
+ chrome.tabs.query({
+ currentWindow: true,
+ active: true
+ }, function(tab) {
+
+ chrome.tabs.insertCSS(tab[0].id, {file: '/cssEditor.css'});
+
+ chrome.tabs.executeScript(tab[0].id, {
+ file: '/cssEditor.js'
+ });
+
+ window.close();
+ });
+};
document.getElementById("editChapters").onclick = function() {
-
+
if (document.getElementById('chapterEditor-Modal')) {
return;
}
@@ -10,13 +141,8 @@ document.getElementById("editChapters").onclick = function() {
active: true
}, function(tab) {
- chrome.tabs.executeScript(tab[0].id, {file: '/jquery.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/utils.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/filesaver.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/jszip.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/jszip-utils.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/saveEbook.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/jquery-sortable.js'});
+ chrome.tabs.executeScript(tab[0].id, {file: './libs/jquery.js'});
+ chrome.tabs.executeScript(tab[0].id, {file: './libs/jquery-sortable.js'});
chrome.tabs.insertCSS(tab[0].id, {file: '/chapterEditor.css'});
chrome.tabs.executeScript(tab[0].id, {
@@ -27,77 +153,46 @@ document.getElementById("editChapters").onclick = function() {
});
};
-function dispatch(action, justAddToBuffer) {
+function dispatch(commandType, justAddToBuffer) {
document.getElementById('busy').style.display = 'block';
if (!justAddToBuffer) {
removeEbook();
}
- chrome.tabs.query({
- currentWindow: true,
- active: true
- }, function(tab) {
- chrome.tabs.sendMessage(tab[0].id, {
- type: 'echo'
- }, function(response) {
- if (!response) {
- chrome.tabs.executeScript(tab[0].id, {file: '/jquery.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/utils.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/filesaver.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/jszip.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/jszip-utils.js'});
- chrome.tabs.executeScript(tab[0].id, {file: '/pure-parser.js'});
-
- chrome.tabs.executeScript(tab[0].id, {
- file: 'extractHtml.js'
- }, function() {
- sendMessage(tab[0].id, action, justAddToBuffer);
- });
- } else if (response.echo) {
- sendMessage(tab[0].id, action, justAddToBuffer);
- }
- });
- });
-}
-
-function sendMessage(tabId, action, justAddToBuffer) {
- chrome.tabs.sendMessage(tabId, {
- type: action
+ chrome.runtime.sendMessage({
+ type: commandType
}, function(response) {
- if (response.length === 0) {
- if (justAddToBuffer) {
- alert('Cannot add an empty selection as chapter!');
- } else {
- alert('Cannot generate the eBook from an empty selection!');
- }
- window.close();
- }
- if (!justAddToBuffer) {
- buildEbook([response]);
- } else {
- getEbookPages(function (allPages) {
- allPages.push(response);
- saveEbookPages(allPages);
- window.close();
- });
- }
- setTimeout(function () {
- document.getElementById('busy').style.display = 'none';
- }, 500);
+ //FIXME - hidden before done
+ document.getElementById('busy').style.display = 'none';
});
}
document.getElementById('savePage').onclick = function() {
- dispatch('extract-page', false);
+ dispatch('save-page', false);
};
document.getElementById('saveSelection').onclick = function() {
- dispatch('extract-selection', false);
+ dispatch('save-selection', false);
};
document.getElementById('pageChapter').onclick = function() {
- dispatch('extract-page', true);
+ dispatch('add-page', true);
};
document.getElementById('selectionChapter').onclick = function() {
- dispatch('extract-selection', true);
+ dispatch('add-selection', true);
};
+
+// get all shortcuts and display them in the menuTitle
+chrome.commands.getAll((commands) => {
+ for (let command of commands) {
+ if (command.name === 'save-page') {
+ document.getElementById('savePageShortcut').appendChild(document.createTextNode(command.shortcut));
+ } else if (command.name === 'save-selection') {
+ document.getElementById('saveSelectionShortcut').appendChild(document.createTextNode(command.shortcut));
+ } else if (command.name === 'add-page') {
+ document.getElementById('pageChapterShortcut').appendChild(document.createTextNode(command.shortcut));
+ } else if (command.name === 'add-selection') {
+ document.getElementById('selectionChapterShortcut').appendChild(document.createTextNode(command.shortcut));
+ }
+ }
+})
diff --git a/web-extension/saveEbook.js b/web-extension/saveEbook.js
index 46eddc2..5198322 100644
--- a/web-extension/saveEbook.js
+++ b/web-extension/saveEbook.js
@@ -1,6 +1,16 @@
var cssFileName = 'ebook.css';
var ebookTitle = null;
+chrome.runtime.onMessage.addListener((obj, sender, sendResponse) => {
+ if (obj.shortcut && obj.shortcut === 'build-ebook') {
+ buildEbook(obj.response);
+ } else if (obj.alert) {
+ console.log(obj.alert);
+ alert(obj.alert);
+ }
+ return true;
+})
+
function getImagesIndex(allImages) {
return allImages.reduce(function(prev, elem, index) {
return prev + '\n' + 'Table of Contents
' + '- ' +
allPages.reduce(function(prev, page) {
- return prev + '\n' + '
- ' + page.title + ' '; + var tmpPageTitle = escapeXMLChars(page.title); + return prev + '\n' + '
- ' + tmpPageTitle + ' '; }, '') + '
+
`
+
+
+document.getElementById('super-selector').addEventListener('mousemove', (e) => {
+// document.getElementsByTagName('body')[0].addEventListener('mousemove', (e) => {
+ e.preventDefault()
+
+ if (lastTargetElem) {
+ lastTargetElem.style.backgroundColor = lastElementData.backgroundColor
+ }
+
+ let targetElem = document.elementFromPoint(e.clientX, e.clientY);
+
+ let targetParent = targetElem.parentNode
+ lastElementData.backgroundColor = targetElem.style.backgroundColor
+
+ targetElem.style.backgroundColor = 'rgba(255,0,0,0.25)'
+ targetElem.dataset.excluded = 'true'
+
+ targetElem.onclick = (e) => {
+ e.preventDefault() // FIXME except for my menu
+ e.stopPropagation();
+
+ let originalClickedElem = e.target
+ let clickedElem = e.target
+
+ if (!clickedElem) {
+ return
+ }
+
+ // console.log(createXPathFromElement(clickedElem));
+
+ ///
+ let tmpElem = document.createElement('div')
+ tmpElem.innerText = createXPathFromElement(clickedElem);
+ document.getElementById('slector-main-menu').appendChild(tmpElem)
+
+ let clickedElemParent = clickedElem.parentNode;
+ let foundClickedEleme = false
+ while (clickedElemParent) {
+ if (!clickedElemParent || !clickedElemParent.style) {
+ break
+ }
+ if (clickedElemParent.id === 'slector-main-menu') {
+ // ignore main menu
+ return
+ }
+ if (clickedElemParent.style.opacity === '0.1') {
+ foundClickedEleme = true
+ clickedElem = clickedElemParent
+ break
+ }
+ clickedElemParent = clickedElemParent.parentNode;
+ }
+
+ if (!clickedElem.style.opacity || clickedElem.style.opacity > 0.2) {
+ clickedElem.style.opacity = 0.1
+ clickedElem.style.border = 'solid 3px black'
+ }
+ else {
+ clickedElem.style.opacity = 1
+ clickedElem.style.border = 'none'
+ }
+ }
+
+ lastTargetElem = targetElem
+})
+
+// src https://stackoverflow.com/questions/2661818/javascript-get-xpath-of-a-node
+function createXPathFromElement(elm) {
+ var allNodes = document.getElementsByTagName('*');
+ for (var segs = []; elm && elm.nodeType == 1; elm = elm.parentNode)
+ {
+ if (elm.hasAttribute('id')) {
+ var uniqueIdCount = 0;
+ for (var n=0;n < allNodes.length;n++) {
+ if (allNodes[n].hasAttribute('id') && allNodes[n].id == elm.id) uniqueIdCount++;
+ if (uniqueIdCount > 1) break;
+ };
+ if ( uniqueIdCount == 1) {
+ segs.unshift('id("' + elm.getAttribute('id') + '")');
+ return segs.join('/');
+ } else {
+ segs.unshift(elm.localName.toLowerCase() + '[@id="' + elm.getAttribute('id') + '"]');
+ }
+ } else if (elm.hasAttribute('class')) {
+ segs.unshift(elm.localName.toLowerCase() + '[@class="' + elm.getAttribute('class') + '"]');
+ } else {
+ for (i = 1, sib = elm.previousSibling; sib; sib = sib.previousSibling) {
+ if (sib.localName == elm.localName) i++; };
+ segs.unshift(elm.localName.toLowerCase() + '[' + i + ']');
+ };
+ };
+ return segs.length ? '/' + segs.join('/') : null;
+};
diff --git a/web-extension/utils.js b/web-extension/utils.js
index 09cc179..1c0fb69 100644
--- a/web-extension/utils.js
+++ b/web-extension/utils.js
@@ -1,3 +1,51 @@
+function setIncludeStyle(includeStyle) {
+ chrome.runtime.sendMessage({
+ type: "set include style",
+ includeStyle: includeStyle
+ }, function(response) {
+ });
+}
+
+function getIncludeStyle(callback) {
+ chrome.runtime.sendMessage({
+ type: "get include style"
+ }, function(response) {
+ callback(response.includeStyle);
+ });
+}
+
+function setCurrentStyle(currentStyle) {
+ chrome.runtime.sendMessage({
+ type: "set current style",
+ currentStyle: currentStyle
+ }, function(response) {
+ });
+}
+
+function getCurrentStyle(callback) {
+ chrome.runtime.sendMessage({
+ type: "get current style"
+ }, function(response) {
+ callback(response.currentStyle);
+ });
+}
+
+function getStyles(callback) {
+ chrome.runtime.sendMessage({
+ type: "get styles"
+ }, function(response) {
+ callback(response.styles);
+ });
+}
+
+function setStyles(styles) {
+ chrome.runtime.sendMessage({
+ type: "set styles",
+ styles: styles
+ }, function(response) {
+ });
+}
+
function getEbookTitle(callback) {
chrome.runtime.sendMessage({
type: "get title"
@@ -35,9 +83,24 @@ function removeEbook() {
}, function(response) {});
}
+function checkIfBusy(callback) {
+ chrome.runtime.sendMessage({
+ type: "is busy?"
+ }, function(response) {
+ callback(response);
+ });
+}
+
+function setIsBusy(isBusy) {
+ chrome.runtime.sendMessage({
+ type: "set is busy",
+ isBusy: isBusy
+ }, function(response) {});
+}
+
/////
function getCurrentUrl() {
- var url = window.location.href;
+ let url = window.location.href;
if (url.indexOf('?') > 0) {
url = window.location.href.split('?')[0];
}
@@ -46,7 +109,7 @@ function getCurrentUrl() {
}
function getOriginUrl() {
- var originUrl = window.location.origin;
+ let originUrl = window.location.origin;
if (!originUrl) {
originUrl = window.location.protocol + "//" + window.location.host;
}
@@ -55,7 +118,7 @@ function getOriginUrl() {
function getFileExtension(fileName) {
try {
- var tmpFileName = '';
+ let tmpFileName = '';
if (isBase64Img(fileName)) {
tmpFileName = getBase64ImgType(fileName);
@@ -71,8 +134,10 @@ function getFileExtension(fileName) {
tmpFileName = 'jpeg';
} else if (tmpFileName === 'svg+xml') {
tmpFileName = 'svg';
- } else if (tmpFileName.trim() === '') {
- tmpFileName = '';
+ }
+
+ if (['png', 'gif', 'jpeg', 'svg'].indexOf(tmpFileName.trim()) < 0) {
+ return ''
}
return tmpFileName;
} catch (e) {
@@ -82,7 +147,7 @@ function getFileExtension(fileName) {
}
function getImageType(fileName) {
- var imageType = getFileExtension(fileName);
+ let imageType = getFileExtension(fileName);
if (imageType === 'svg') {
imageType = 'svg+xml';
}
@@ -97,18 +162,21 @@ function getImgDownloadUrl(imgSrc) {
return getAbsoluteUrl(imgSrc);
}
-function getAbsoluteUrl(urlStr) {
+function getAbsoluteUrl(urlStr) {
if (!urlStr) {
return '';
}
+ if (urlStr.length === 0) {
+ return '';
+ }
try {
- if (urlStr.length === 0) {
- return '';
- }
- urlStr = decodeHtmlEntity(urlStr);
- var currentUrl = getCurrentUrl();
- var originUrl = getOriginUrl();
- var absoluteUrl = urlStr;
+ urlStr = decodeHtmlEntity(urlStr);
+ let currentUrl = getCurrentUrl();
+ let originUrl = getOriginUrl();
+ let absoluteUrl = urlStr;
+
+ originUrl = removeEndingSlash(originUrl)
+ currentUrl = removeEndingSlash(currentUrl)
if (urlStr.indexOf('//') === 0) {
absoluteUrl = window.location.protocol + urlStr;
@@ -119,6 +187,8 @@ function getAbsoluteUrl(urlStr) {
} else if (urlStr.indexOf('http') !== 0) {
absoluteUrl = currentUrl + '/' + urlStr;
}
+ // TODO is this needed?
+ // absoluteUrl = escapeXMLChars(absoluteUrl);
return absoluteUrl;
} catch (e) {
console.log('Error:', e);
@@ -126,20 +196,27 @@ function getAbsoluteUrl(urlStr) {
}
}
+function removeEndingSlash(inputStr) {
+ if (inputStr.endsWith('/')) {
+ return inputStr.substring(0, inputStr.length - 1);
+ }
+ return inputStr;
+}
+
// https://gist.github.com/jonleighton/958841
function base64ArrayBuffer(arrayBuffer) {
- var base64 = '';
- var encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+ let base64 = '';
+ let encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
- var bytes = new Uint8Array(arrayBuffer);
- var byteLength = bytes.byteLength;
- var byteRemainder = byteLength % 3;
- var mainLength = byteLength - byteRemainder;
+ let bytes = new Uint8Array(arrayBuffer);
+ let byteLength = bytes.byteLength;
+ let byteRemainder = byteLength % 3;
+ let mainLength = byteLength - byteRemainder;
- var a, b, c, d;
- var chunk;
+ let a, b, c, d;
+ let chunk;
- for (var i = 0; i < mainLength; i = i + 3) {
+ for (let i = 0; i < mainLength; i = i + 3) {
chunk = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
a = (chunk & 16515072) >> 18;
b = (chunk & 258048) >> 12;
@@ -194,11 +271,13 @@ function getBase64ImgData(srcTxt) {
}
function getXPath(elm) {
- var allNodes = document.getElementsByTagName('*');
- for (var segs = []; elm && elm.nodeType === 1; elm = elm.parentNode) {
+ if (!elm) return ''
+
+ let allNodes = document.getElementsByTagName('*');
+ for (let segs = []; elm && elm.nodeType === 1; elm = elm.parentNode) {
if (elm.hasAttribute('id')) {
- var uniqueIdCount = 0;
- for (var n = 0; n < allNodes.length; n++) {
+ let uniqueIdCount = 0;
+ for (let n = 0; n < allNodes.length; n++) {
if (allNodes[n].hasAttribute('id') && allNodes[n].id === elm.id) {
uniqueIdCount++;
}
@@ -227,17 +306,71 @@ function getXPath(elm) {
}
function lookupElementByXPath(path) {
- var evaluator = new XPathEvaluator();
- var result = evaluator.evaluate(path, document.documentElement, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+ let evaluator = new XPathEvaluator();
+ let result = evaluator.evaluate(path, document.documentElement, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
return result.singleNodeValue;
}
function generateRandomTag(tagLen) {
tagLen = tagLen || 5;
- var text = '';
- var possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
- for(var i = 0; i < tagLen; i++) {
+ let text = '';
+ let possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+ for(let i = 0; i < tagLen; i++) {
text += possible.charAt(Math.floor(Math.random() * possible.length));
}
return text;
}
+
+function generateRandomNumber(bigNr) {
+ if (bigNr) {
+ return Math.floor(Math.random()*1000000*Math.random()*1000000)
+ }
+ return Math.floor(Math.random()*1000000)
+}
+
+function removeSpecialChars(text) {
+ // FIXME remove white spaces ?
+ return text.replace(/\//g, '-')
+}
+
+function escapeXMLChars(text) {
+ return text.replace(/&/g, '&')
+ .replace(/>/g, '>')
+ .replace(/${bodyInner}'
+
+