From efca0f86ac7f76d449ecd592f12e7b526e5f2adf Mon Sep 17 00:00:00 2001 From: Michel Roux Date: Sat, 17 Jun 2023 00:16:04 +0200 Subject: [PATCH] Move JS to public --- .l10nignore | 91 ----- composer.json | 2 +- js/ready.js | 20 +- {vendor => public}/bartaz/jquery.highlight.js | 0 {vendor => public}/bgrins/spectrum.css | 0 {vendor => public}/bgrins/spectrum.js | 0 {vendor => public}/bitjs/archive/archive.js | 0 {vendor => public}/bitjs/archive/rarvm.js | 0 {vendor => public}/bitjs/archive/unrar.js | 0 {vendor => public}/bitjs/archive/untar.js | 0 {vendor => public}/bitjs/archive/unzip.js | 0 {vendor => public}/bitjs/io/bitstream.js | 0 {vendor => public}/bitjs/io/bytebuffer.js | 0 {vendor => public}/bitjs/io/bytestream.js | 0 {vendor => public}/cbrjs/cbr.js | 4 +- {vendor => public}/cbrjs/css/cbr.css | 0 {vendor => public}/cbrjs/css/idevice.css | 0 {vendor => public}/cbrjs/img/loading.gif | Bin {vendor => public}/epubjs/css/annotations.css | 0 .../epubjs/css/font/fontello.eot | Bin .../epubjs/css/font/fontello.svg | 0 .../epubjs/css/font/fontello.ttf | Bin .../epubjs/css/font/fontello.woff | Bin {vendor => public}/epubjs/css/idevice.css | 0 {vendor => public}/epubjs/css/main.css | 0 {vendor => public}/epubjs/css/normalize.css | 0 {vendor => public}/epubjs/css/popup.css | 0 {vendor => public}/epubjs/css/sidebar.css | 0 {vendor => public}/epubjs/epub.main.css | 0 {vendor => public}/epubjs/epub.min.js | 0 {vendor => public}/epubjs/epub.min.map | 0 {vendor => public}/epubjs/hooks.min.js | 0 {vendor => public}/epubjs/hooks.min.map | 0 .../epubjs/hooks/default/smartimages.js | 0 .../epubjs/hooks/extensions/highlight.js | 0 {vendor => public}/epubjs/libs/jquery.min.js | 0 .../epubjs/libs/screenfull.min.js | 0 {vendor => public}/epubjs/libs/zip.min.js | 0 {vendor => public}/epubjs/reader.min.js | 0 {vendor => public}/epubjs/reader.min.map | 0 {vendor => public}/icomoon/fonts/icomoon.eot | Bin {vendor => public}/icomoon/fonts/icomoon.svg | 0 {vendor => public}/icomoon/fonts/icomoon.ttf | Bin {vendor => public}/icomoon/fonts/icomoon.woff | Bin {vendor => public}/icomoon/style.css | 0 {vendor => public}/jquery/put-delete.js | 0 .../controllers/annotationlayer_controller.js | 0 .../pdfjs/controllers/bookmarks_controller.js | 0 .../pdfjs/controllers/controls_controller.js | 0 .../pdfjs/controllers/meta_controller.js | 0 .../pdfjs/controllers/notes_controller.js | 0 .../pdfjs/controllers/outline_controller.js | 0 .../pdfjs/controllers/progress_controller.js | 0 .../pdfjs/controllers/reader_controller.js | 0 .../pdfjs/controllers/search_controller.js | 0 .../pdfjs/controllers/settings_controller.js | 0 .../pdfjs/controllers/sidebar_controller.js | 0 .../pdfjs/controllers/styles_controller.js | 0 .../pdfjs/controllers/textlayer_controller.js | 0 .../textlayer_controller.js.simple | 0 .../pdfjs/controllers/toc_controller.js | 0 .../pdfjs/css/annotation_layer_builder.css | 0 {vendor => public}/pdfjs/css/annotations.css | 0 {vendor => public}/pdfjs/css/idevice.css | 0 .../pdfjs/css/images/annotation-check.svg | 0 .../pdfjs/css/images/annotation-comment.svg | 0 .../pdfjs/css/images/annotation-help.svg | 0 .../pdfjs/css/images/annotation-insert.svg | 0 .../pdfjs/css/images/annotation-key.svg | 0 .../css/images/annotation-newparagraph.svg | 0 .../pdfjs/css/images/annotation-noicon.svg | 0 .../pdfjs/css/images/annotation-note.svg | 0 .../pdfjs/css/images/annotation-paragraph.svg | 0 {vendor => public}/pdfjs/css/main.css | 0 {vendor => public}/pdfjs/css/normalize.css | 0 {vendor => public}/pdfjs/css/popup.css | 0 {vendor => public}/pdfjs/css/sidebar.css | 0 .../pdfjs/css/text_layer_builder.css | 0 {vendor => public}/pdfjs/lib/pdf.js | 0 {vendor => public}/pdfjs/lib/pdf.worker.js | 0 .../pdfjs/lib/text_layer_builder.js | 0 {vendor => public}/pdfjs/pdf.reader.js | 0 .../pdfjs/services/eventbus_service.js | 0 .../pdfjs/services/link_service.js | 0 .../pdfjs/services/simple_link_service.js | 0 .../pixastic/pixastic.effects.js | 0 {vendor => public}/pixastic/pixastic.js | 0 .../pixastic/pixastic.worker.control.js | 0 .../pixastic/pixastic.worker.js | 0 .../pixastic/pixastic_combined.js | 354 +++++++++--------- {vendor => public}/sindresorhus/screenfull.js | 0 templates/cbreader.php | 16 +- templates/epubreader.php | 32 +- templates/pdfreader.php | 62 +-- 94 files changed, 245 insertions(+), 336 deletions(-) delete mode 100644 .l10nignore rename {vendor => public}/bartaz/jquery.highlight.js (100%) rename {vendor => public}/bgrins/spectrum.css (100%) rename {vendor => public}/bgrins/spectrum.js (100%) rename {vendor => public}/bitjs/archive/archive.js (100%) rename {vendor => public}/bitjs/archive/rarvm.js (100%) rename {vendor => public}/bitjs/archive/unrar.js (100%) rename {vendor => public}/bitjs/archive/untar.js (100%) rename {vendor => public}/bitjs/archive/unzip.js (100%) rename {vendor => public}/bitjs/io/bitstream.js (100%) rename {vendor => public}/bitjs/io/bytebuffer.js (100%) rename {vendor => public}/bitjs/io/bytestream.js (100%) rename {vendor => public}/cbrjs/cbr.js (99%) rename {vendor => public}/cbrjs/css/cbr.css (100%) rename {vendor => public}/cbrjs/css/idevice.css (100%) rename {vendor => public}/cbrjs/img/loading.gif (100%) rename {vendor => public}/epubjs/css/annotations.css (100%) rename {vendor => public}/epubjs/css/font/fontello.eot (100%) rename {vendor => public}/epubjs/css/font/fontello.svg (100%) rename {vendor => public}/epubjs/css/font/fontello.ttf (100%) rename {vendor => public}/epubjs/css/font/fontello.woff (100%) rename {vendor => public}/epubjs/css/idevice.css (100%) rename {vendor => public}/epubjs/css/main.css (100%) rename {vendor => public}/epubjs/css/normalize.css (100%) rename {vendor => public}/epubjs/css/popup.css (100%) rename {vendor => public}/epubjs/css/sidebar.css (100%) rename {vendor => public}/epubjs/epub.main.css (100%) rename {vendor => public}/epubjs/epub.min.js (100%) rename {vendor => public}/epubjs/epub.min.map (100%) rename {vendor => public}/epubjs/hooks.min.js (100%) rename {vendor => public}/epubjs/hooks.min.map (100%) rename {vendor => public}/epubjs/hooks/default/smartimages.js (100%) rename {vendor => public}/epubjs/hooks/extensions/highlight.js (100%) rename {vendor => public}/epubjs/libs/jquery.min.js (100%) rename {vendor => public}/epubjs/libs/screenfull.min.js (100%) rename {vendor => public}/epubjs/libs/zip.min.js (100%) rename {vendor => public}/epubjs/reader.min.js (100%) rename {vendor => public}/epubjs/reader.min.map (100%) rename {vendor => public}/icomoon/fonts/icomoon.eot (100%) rename {vendor => public}/icomoon/fonts/icomoon.svg (100%) rename {vendor => public}/icomoon/fonts/icomoon.ttf (100%) rename {vendor => public}/icomoon/fonts/icomoon.woff (100%) rename {vendor => public}/icomoon/style.css (100%) rename {vendor => public}/jquery/put-delete.js (100%) rename {vendor => public}/pdfjs/controllers/annotationlayer_controller.js (100%) rename {vendor => public}/pdfjs/controllers/bookmarks_controller.js (100%) rename {vendor => public}/pdfjs/controllers/controls_controller.js (100%) rename {vendor => public}/pdfjs/controllers/meta_controller.js (100%) rename {vendor => public}/pdfjs/controllers/notes_controller.js (100%) rename {vendor => public}/pdfjs/controllers/outline_controller.js (100%) rename {vendor => public}/pdfjs/controllers/progress_controller.js (100%) rename {vendor => public}/pdfjs/controllers/reader_controller.js (100%) rename {vendor => public}/pdfjs/controllers/search_controller.js (100%) rename {vendor => public}/pdfjs/controllers/settings_controller.js (100%) rename {vendor => public}/pdfjs/controllers/sidebar_controller.js (100%) rename {vendor => public}/pdfjs/controllers/styles_controller.js (100%) rename {vendor => public}/pdfjs/controllers/textlayer_controller.js (100%) rename {vendor => public}/pdfjs/controllers/textlayer_controller.js.simple (100%) rename {vendor => public}/pdfjs/controllers/toc_controller.js (100%) rename {vendor => public}/pdfjs/css/annotation_layer_builder.css (100%) rename {vendor => public}/pdfjs/css/annotations.css (100%) rename {vendor => public}/pdfjs/css/idevice.css (100%) rename {vendor => public}/pdfjs/css/images/annotation-check.svg (100%) rename {vendor => public}/pdfjs/css/images/annotation-comment.svg (100%) rename {vendor => public}/pdfjs/css/images/annotation-help.svg (100%) rename {vendor => public}/pdfjs/css/images/annotation-insert.svg (100%) rename {vendor => public}/pdfjs/css/images/annotation-key.svg (100%) rename {vendor => public}/pdfjs/css/images/annotation-newparagraph.svg (100%) rename {vendor => public}/pdfjs/css/images/annotation-noicon.svg (100%) rename {vendor => public}/pdfjs/css/images/annotation-note.svg (100%) rename {vendor => public}/pdfjs/css/images/annotation-paragraph.svg (100%) rename {vendor => public}/pdfjs/css/main.css (100%) rename {vendor => public}/pdfjs/css/normalize.css (100%) rename {vendor => public}/pdfjs/css/popup.css (100%) rename {vendor => public}/pdfjs/css/sidebar.css (100%) rename {vendor => public}/pdfjs/css/text_layer_builder.css (100%) rename {vendor => public}/pdfjs/lib/pdf.js (100%) rename {vendor => public}/pdfjs/lib/pdf.worker.js (100%) rename {vendor => public}/pdfjs/lib/text_layer_builder.js (100%) rename {vendor => public}/pdfjs/pdf.reader.js (100%) rename {vendor => public}/pdfjs/services/eventbus_service.js (100%) rename {vendor => public}/pdfjs/services/link_service.js (100%) rename {vendor => public}/pdfjs/services/simple_link_service.js (100%) rename {vendor => public}/pixastic/pixastic.effects.js (100%) rename {vendor => public}/pixastic/pixastic.js (100%) rename {vendor => public}/pixastic/pixastic.worker.control.js (100%) rename {vendor => public}/pixastic/pixastic.worker.js (100%) rename {vendor => public}/pixastic/pixastic_combined.js (94%) rename {vendor => public}/sindresorhus/screenfull.js (100%) diff --git a/.l10nignore b/.l10nignore deleted file mode 100644 index e8ee91a..0000000 --- a/.l10nignore +++ /dev/null @@ -1,91 +0,0 @@ -js/lib/typearray.js -js/lib/typearray.min.js -js/lib/wgxpath.install.js -vendor/bitjs/io/bytebuffer.js -vendor/bitjs/io/bytestream.js -vendor/bitjs/io/bitstream.js -vendor/bitjs/archive/unzip.js -vendor/bitjs/archive/untar.js -vendor/bitjs/archive/unrar.js -vendor/bitjs/archive/rarvm.js -vendor/bitjs/archive/archive.js -vendor/pixastic/pixastic_combined.js -vendor/pixastic/pixastic.worker.js -vendor/pixastic/pixastic.effects.js -vendor/pixastic/pixastic.worker.control.js -vendor/pixastic/pixastic.js -vendor/icomoon/style.css -vendor/icomoon/fonts/icomoon.svg -vendor/icomoon/fonts/icomoon.woff -vendor/icomoon/fonts/icomoon.ttf -vendor/icomoon/fonts/icomoon.eot -vendor/bartaz/jquery.highlight.js -vendor/sindresorhus/screenfull.js -vendor/jquery/put-delete.js -vendor/epubjs/libs/zip.min.js -vendor/epubjs/libs/jquery.min.js -vendor/epubjs/libs/screenfull.min.js -vendor/epubjs/hooks.min.map -vendor/epubjs/epub.min.js -vendor/epubjs/css/popup.css -vendor/epubjs/css/main.css -vendor/epubjs/css/normalize.css -vendor/epubjs/css/sidebar.css -vendor/epubjs/css/font/fontello.svg -vendor/epubjs/css/font/fontello.woff -vendor/epubjs/css/font/fontello.eot -vendor/epubjs/css/font/fontello.ttf -vendor/epubjs/css/annotations.css -vendor/epubjs/css/idevice.css -vendor/epubjs/epub.main.css -vendor/epubjs/reader.min.js -vendor/epubjs/epub.min.map -vendor/epubjs/hooks.min.js -vendor/epubjs/hooks/default/smartimages.js -vendor/epubjs/hooks/extensions/highlight.js -vendor/epubjs/reader.min.map -vendor/bgrins/spectrum.js -vendor/bgrins/spectrum.css -vendor/cbrjs/css/cbr.css -vendor/cbrjs/css/idevice.css -vendor/cbrjs/cbr.js -vendor/cbrjs/img/loading.gif -vendor/pdfjs/css/popup.css -vendor/pdfjs/css/main.css -vendor/pdfjs/css/annotation_layer_builder.css -vendor/pdfjs/css/normalize.css -vendor/pdfjs/css/sidebar.css -vendor/pdfjs/css/annotations.css -vendor/pdfjs/css/text_layer_builder.css -vendor/pdfjs/css/idevice.css -vendor/pdfjs/css/images/annotation-insert.svg -vendor/pdfjs/css/images/annotation-newparagraph.svg -vendor/pdfjs/css/images/annotation-key.svg -vendor/pdfjs/css/images/annotation-check.svg -vendor/pdfjs/css/images/annotation-paragraph.svg -vendor/pdfjs/css/images/annotation-help.svg -vendor/pdfjs/css/images/annotation-noicon.svg -vendor/pdfjs/css/images/annotation-comment.svg -vendor/pdfjs/css/images/annotation-note.svg -vendor/pdfjs/pdf.reader.js -vendor/pdfjs/controllers/textlayer_controller.js -vendor/pdfjs/controllers/sidebar_controller.js -vendor/pdfjs/controllers/outline_controller.js -vendor/pdfjs/controllers/styles_controller.js -vendor/pdfjs/controllers/notes_controller.js -vendor/pdfjs/controllers/settings_controller.js -vendor/pdfjs/controllers/meta_controller.js -vendor/pdfjs/controllers/reader_controller.js -vendor/pdfjs/controllers/bookmarks_controller.js -vendor/pdfjs/controllers/progress_controller.js -vendor/pdfjs/controllers/toc_controller.js -vendor/pdfjs/controllers/search_controller.js -vendor/pdfjs/controllers/controls_controller.js -vendor/pdfjs/controllers/annotationlayer_controller.js -vendor/pdfjs/controllers/textlayer_controller.js.simple -vendor/pdfjs/services/eventbus_service.js -vendor/pdfjs/services/simple_link_service.js -vendor/pdfjs/services/link_service.js -vendor/pdfjs/lib/pdf.worker.js -vendor/pdfjs/lib/text_layer_builder.js -vendor/pdfjs/lib/pdf.js diff --git a/composer.json b/composer.json index 03eaf88..8e8e0fb 100644 --- a/composer.json +++ b/composer.json @@ -28,4 +28,4 @@ "php": "7.4" } } -} \ No newline at end of file +} diff --git a/js/ready.js b/js/ready.js index d14fdfe..511fa4e 100644 --- a/js/ready.js +++ b/js/ready.js @@ -1,4 +1,4 @@ -document.onreadystatechange = function () { +document.onreadystatechange = function () { if (document.readyState == "complete") { @@ -77,7 +77,7 @@ document.onreadystatechange = function () { return $.get(options.session.basePath + "bookmark/cursor/" + options.session.fileId); }; options.session.setCursor = function(value) { - return $.post(options.session.basePath + "bookmark/cursor", + return $.post(options.session.basePath + "bookmark/cursor", { "fileId": options.session.fileId, "value": JSON.stringify(value) @@ -103,7 +103,7 @@ document.onreadystatechange = function () { } } - // why is there no standard library function for this? + // why is there no standard library function for this? function getUrlParameter (param) { var pattern = new RegExp('[?&]'+param+'((=([^&]*))|(?=(&|$)))','i'); var m = window.location.search.match(pattern); @@ -113,9 +113,9 @@ document.onreadystatechange = function () { // start epub.js renderer function renderEpub(file, options) { - // some parameters... - EPUBJS.filePath = "vendor/epubjs/"; - EPUBJS.cssPath = "vendor/epubjs/css/"; + // some parameters... + EPUBJS.filePath = "public/epubjs/"; + EPUBJS.cssPath = "public/epubjs/css/"; EPUBJS.basePath = $('.session').data('basepath'); EPUBJS.staticPath = $('.session').data('staticpath'); @@ -136,16 +136,16 @@ document.onreadystatechange = function () { // start cbr.js renderer function renderCbr(file, options) { - CBRJS.filePath = "vendor/cbrjs/"; + CBRJS.filePath = "public/cbrjs/"; var reader = cbReader(file, options); } // start pdf.js renderer function renderPdf(file, options) { - PDFJS.filePath = "vendor/pdfjs/"; - PDFJS.imageResourcesPath = "vendor/pdfjs/css/images/"; - PDFJS.workerSrc = options.session.staticPath + 'vendor/pdfjs/lib/pdf.worker.js'; + PDFJS.filePath = "public/pdfjs/"; + PDFJS.imageResourcesPath = "public/pdfjs/css/images/"; + PDFJS.workerSrc = options.session.staticPath + 'public/pdfjs/lib/pdf.worker.js'; var reader = pdfReader(file, options); } diff --git a/vendor/bartaz/jquery.highlight.js b/public/bartaz/jquery.highlight.js similarity index 100% rename from vendor/bartaz/jquery.highlight.js rename to public/bartaz/jquery.highlight.js diff --git a/vendor/bgrins/spectrum.css b/public/bgrins/spectrum.css similarity index 100% rename from vendor/bgrins/spectrum.css rename to public/bgrins/spectrum.css diff --git a/vendor/bgrins/spectrum.js b/public/bgrins/spectrum.js similarity index 100% rename from vendor/bgrins/spectrum.js rename to public/bgrins/spectrum.js diff --git a/vendor/bitjs/archive/archive.js b/public/bitjs/archive/archive.js similarity index 100% rename from vendor/bitjs/archive/archive.js rename to public/bitjs/archive/archive.js diff --git a/vendor/bitjs/archive/rarvm.js b/public/bitjs/archive/rarvm.js similarity index 100% rename from vendor/bitjs/archive/rarvm.js rename to public/bitjs/archive/rarvm.js diff --git a/vendor/bitjs/archive/unrar.js b/public/bitjs/archive/unrar.js similarity index 100% rename from vendor/bitjs/archive/unrar.js rename to public/bitjs/archive/unrar.js diff --git a/vendor/bitjs/archive/untar.js b/public/bitjs/archive/untar.js similarity index 100% rename from vendor/bitjs/archive/untar.js rename to public/bitjs/archive/untar.js diff --git a/vendor/bitjs/archive/unzip.js b/public/bitjs/archive/unzip.js similarity index 100% rename from vendor/bitjs/archive/unzip.js rename to public/bitjs/archive/unzip.js diff --git a/vendor/bitjs/io/bitstream.js b/public/bitjs/io/bitstream.js similarity index 100% rename from vendor/bitjs/io/bitstream.js rename to public/bitjs/io/bitstream.js diff --git a/vendor/bitjs/io/bytebuffer.js b/public/bitjs/io/bytebuffer.js similarity index 100% rename from vendor/bitjs/io/bytebuffer.js rename to public/bitjs/io/bytebuffer.js diff --git a/vendor/bitjs/io/bytestream.js b/public/bitjs/io/bytestream.js similarity index 100% rename from vendor/bitjs/io/bytestream.js rename to public/bitjs/io/bytestream.js diff --git a/vendor/cbrjs/cbr.js b/public/cbrjs/cbr.js similarity index 99% rename from vendor/cbrjs/cbr.js rename to public/cbrjs/cbr.js index e866d25..9c9bcd1 100644 --- a/vendor/cbrjs/cbr.js +++ b/public/cbrjs/cbr.js @@ -73,7 +73,7 @@ CBRJS.Reader = function(bookPath, _options) { xhr.onload = function () { if ((this.status === 200) && this.response) { var done = false; - var ua = new bitjs.archive[archive_class](this.response, document.head.dataset.staticpath + 'vendor/bitjs/'); + var ua = new bitjs.archive[archive_class](this.response, document.head.dataset.staticpath + 'public/bitjs/'); ua.addEventListener(bitjs.archive.UnarchiveEvent.Type.START, function (e) { $progressbar.css('width', '0%'); @@ -276,7 +276,7 @@ ComicBook = (function ($) { 70: 'toggleFullscreen', // f 27: 'closeSidebar' // esc }, - vendorPath: document.head.dataset.staticpath + 'vendor/', + vendorPath: document.head.dataset.staticpath + 'public/', forward_buffer: 3, session: { getCursor: function() {}, diff --git a/vendor/cbrjs/css/cbr.css b/public/cbrjs/css/cbr.css similarity index 100% rename from vendor/cbrjs/css/cbr.css rename to public/cbrjs/css/cbr.css diff --git a/vendor/cbrjs/css/idevice.css b/public/cbrjs/css/idevice.css similarity index 100% rename from vendor/cbrjs/css/idevice.css rename to public/cbrjs/css/idevice.css diff --git a/vendor/cbrjs/img/loading.gif b/public/cbrjs/img/loading.gif similarity index 100% rename from vendor/cbrjs/img/loading.gif rename to public/cbrjs/img/loading.gif diff --git a/vendor/epubjs/css/annotations.css b/public/epubjs/css/annotations.css similarity index 100% rename from vendor/epubjs/css/annotations.css rename to public/epubjs/css/annotations.css diff --git a/vendor/epubjs/css/font/fontello.eot b/public/epubjs/css/font/fontello.eot similarity index 100% rename from vendor/epubjs/css/font/fontello.eot rename to public/epubjs/css/font/fontello.eot diff --git a/vendor/epubjs/css/font/fontello.svg b/public/epubjs/css/font/fontello.svg similarity index 100% rename from vendor/epubjs/css/font/fontello.svg rename to public/epubjs/css/font/fontello.svg diff --git a/vendor/epubjs/css/font/fontello.ttf b/public/epubjs/css/font/fontello.ttf similarity index 100% rename from vendor/epubjs/css/font/fontello.ttf rename to public/epubjs/css/font/fontello.ttf diff --git a/vendor/epubjs/css/font/fontello.woff b/public/epubjs/css/font/fontello.woff similarity index 100% rename from vendor/epubjs/css/font/fontello.woff rename to public/epubjs/css/font/fontello.woff diff --git a/vendor/epubjs/css/idevice.css b/public/epubjs/css/idevice.css similarity index 100% rename from vendor/epubjs/css/idevice.css rename to public/epubjs/css/idevice.css diff --git a/vendor/epubjs/css/main.css b/public/epubjs/css/main.css similarity index 100% rename from vendor/epubjs/css/main.css rename to public/epubjs/css/main.css diff --git a/vendor/epubjs/css/normalize.css b/public/epubjs/css/normalize.css similarity index 100% rename from vendor/epubjs/css/normalize.css rename to public/epubjs/css/normalize.css diff --git a/vendor/epubjs/css/popup.css b/public/epubjs/css/popup.css similarity index 100% rename from vendor/epubjs/css/popup.css rename to public/epubjs/css/popup.css diff --git a/vendor/epubjs/css/sidebar.css b/public/epubjs/css/sidebar.css similarity index 100% rename from vendor/epubjs/css/sidebar.css rename to public/epubjs/css/sidebar.css diff --git a/vendor/epubjs/epub.main.css b/public/epubjs/epub.main.css similarity index 100% rename from vendor/epubjs/epub.main.css rename to public/epubjs/epub.main.css diff --git a/vendor/epubjs/epub.min.js b/public/epubjs/epub.min.js similarity index 100% rename from vendor/epubjs/epub.min.js rename to public/epubjs/epub.min.js diff --git a/vendor/epubjs/epub.min.map b/public/epubjs/epub.min.map similarity index 100% rename from vendor/epubjs/epub.min.map rename to public/epubjs/epub.min.map diff --git a/vendor/epubjs/hooks.min.js b/public/epubjs/hooks.min.js similarity index 100% rename from vendor/epubjs/hooks.min.js rename to public/epubjs/hooks.min.js diff --git a/vendor/epubjs/hooks.min.map b/public/epubjs/hooks.min.map similarity index 100% rename from vendor/epubjs/hooks.min.map rename to public/epubjs/hooks.min.map diff --git a/vendor/epubjs/hooks/default/smartimages.js b/public/epubjs/hooks/default/smartimages.js similarity index 100% rename from vendor/epubjs/hooks/default/smartimages.js rename to public/epubjs/hooks/default/smartimages.js diff --git a/vendor/epubjs/hooks/extensions/highlight.js b/public/epubjs/hooks/extensions/highlight.js similarity index 100% rename from vendor/epubjs/hooks/extensions/highlight.js rename to public/epubjs/hooks/extensions/highlight.js diff --git a/vendor/epubjs/libs/jquery.min.js b/public/epubjs/libs/jquery.min.js similarity index 100% rename from vendor/epubjs/libs/jquery.min.js rename to public/epubjs/libs/jquery.min.js diff --git a/vendor/epubjs/libs/screenfull.min.js b/public/epubjs/libs/screenfull.min.js similarity index 100% rename from vendor/epubjs/libs/screenfull.min.js rename to public/epubjs/libs/screenfull.min.js diff --git a/vendor/epubjs/libs/zip.min.js b/public/epubjs/libs/zip.min.js similarity index 100% rename from vendor/epubjs/libs/zip.min.js rename to public/epubjs/libs/zip.min.js diff --git a/vendor/epubjs/reader.min.js b/public/epubjs/reader.min.js similarity index 100% rename from vendor/epubjs/reader.min.js rename to public/epubjs/reader.min.js diff --git a/vendor/epubjs/reader.min.map b/public/epubjs/reader.min.map similarity index 100% rename from vendor/epubjs/reader.min.map rename to public/epubjs/reader.min.map diff --git a/vendor/icomoon/fonts/icomoon.eot b/public/icomoon/fonts/icomoon.eot similarity index 100% rename from vendor/icomoon/fonts/icomoon.eot rename to public/icomoon/fonts/icomoon.eot diff --git a/vendor/icomoon/fonts/icomoon.svg b/public/icomoon/fonts/icomoon.svg similarity index 100% rename from vendor/icomoon/fonts/icomoon.svg rename to public/icomoon/fonts/icomoon.svg diff --git a/vendor/icomoon/fonts/icomoon.ttf b/public/icomoon/fonts/icomoon.ttf similarity index 100% rename from vendor/icomoon/fonts/icomoon.ttf rename to public/icomoon/fonts/icomoon.ttf diff --git a/vendor/icomoon/fonts/icomoon.woff b/public/icomoon/fonts/icomoon.woff similarity index 100% rename from vendor/icomoon/fonts/icomoon.woff rename to public/icomoon/fonts/icomoon.woff diff --git a/vendor/icomoon/style.css b/public/icomoon/style.css similarity index 100% rename from vendor/icomoon/style.css rename to public/icomoon/style.css diff --git a/vendor/jquery/put-delete.js b/public/jquery/put-delete.js similarity index 100% rename from vendor/jquery/put-delete.js rename to public/jquery/put-delete.js diff --git a/vendor/pdfjs/controllers/annotationlayer_controller.js b/public/pdfjs/controllers/annotationlayer_controller.js similarity index 100% rename from vendor/pdfjs/controllers/annotationlayer_controller.js rename to public/pdfjs/controllers/annotationlayer_controller.js diff --git a/vendor/pdfjs/controllers/bookmarks_controller.js b/public/pdfjs/controllers/bookmarks_controller.js similarity index 100% rename from vendor/pdfjs/controllers/bookmarks_controller.js rename to public/pdfjs/controllers/bookmarks_controller.js diff --git a/vendor/pdfjs/controllers/controls_controller.js b/public/pdfjs/controllers/controls_controller.js similarity index 100% rename from vendor/pdfjs/controllers/controls_controller.js rename to public/pdfjs/controllers/controls_controller.js diff --git a/vendor/pdfjs/controllers/meta_controller.js b/public/pdfjs/controllers/meta_controller.js similarity index 100% rename from vendor/pdfjs/controllers/meta_controller.js rename to public/pdfjs/controllers/meta_controller.js diff --git a/vendor/pdfjs/controllers/notes_controller.js b/public/pdfjs/controllers/notes_controller.js similarity index 100% rename from vendor/pdfjs/controllers/notes_controller.js rename to public/pdfjs/controllers/notes_controller.js diff --git a/vendor/pdfjs/controllers/outline_controller.js b/public/pdfjs/controllers/outline_controller.js similarity index 100% rename from vendor/pdfjs/controllers/outline_controller.js rename to public/pdfjs/controllers/outline_controller.js diff --git a/vendor/pdfjs/controllers/progress_controller.js b/public/pdfjs/controllers/progress_controller.js similarity index 100% rename from vendor/pdfjs/controllers/progress_controller.js rename to public/pdfjs/controllers/progress_controller.js diff --git a/vendor/pdfjs/controllers/reader_controller.js b/public/pdfjs/controllers/reader_controller.js similarity index 100% rename from vendor/pdfjs/controllers/reader_controller.js rename to public/pdfjs/controllers/reader_controller.js diff --git a/vendor/pdfjs/controllers/search_controller.js b/public/pdfjs/controllers/search_controller.js similarity index 100% rename from vendor/pdfjs/controllers/search_controller.js rename to public/pdfjs/controllers/search_controller.js diff --git a/vendor/pdfjs/controllers/settings_controller.js b/public/pdfjs/controllers/settings_controller.js similarity index 100% rename from vendor/pdfjs/controllers/settings_controller.js rename to public/pdfjs/controllers/settings_controller.js diff --git a/vendor/pdfjs/controllers/sidebar_controller.js b/public/pdfjs/controllers/sidebar_controller.js similarity index 100% rename from vendor/pdfjs/controllers/sidebar_controller.js rename to public/pdfjs/controllers/sidebar_controller.js diff --git a/vendor/pdfjs/controllers/styles_controller.js b/public/pdfjs/controllers/styles_controller.js similarity index 100% rename from vendor/pdfjs/controllers/styles_controller.js rename to public/pdfjs/controllers/styles_controller.js diff --git a/vendor/pdfjs/controllers/textlayer_controller.js b/public/pdfjs/controllers/textlayer_controller.js similarity index 100% rename from vendor/pdfjs/controllers/textlayer_controller.js rename to public/pdfjs/controllers/textlayer_controller.js diff --git a/vendor/pdfjs/controllers/textlayer_controller.js.simple b/public/pdfjs/controllers/textlayer_controller.js.simple similarity index 100% rename from vendor/pdfjs/controllers/textlayer_controller.js.simple rename to public/pdfjs/controllers/textlayer_controller.js.simple diff --git a/vendor/pdfjs/controllers/toc_controller.js b/public/pdfjs/controllers/toc_controller.js similarity index 100% rename from vendor/pdfjs/controllers/toc_controller.js rename to public/pdfjs/controllers/toc_controller.js diff --git a/vendor/pdfjs/css/annotation_layer_builder.css b/public/pdfjs/css/annotation_layer_builder.css similarity index 100% rename from vendor/pdfjs/css/annotation_layer_builder.css rename to public/pdfjs/css/annotation_layer_builder.css diff --git a/vendor/pdfjs/css/annotations.css b/public/pdfjs/css/annotations.css similarity index 100% rename from vendor/pdfjs/css/annotations.css rename to public/pdfjs/css/annotations.css diff --git a/vendor/pdfjs/css/idevice.css b/public/pdfjs/css/idevice.css similarity index 100% rename from vendor/pdfjs/css/idevice.css rename to public/pdfjs/css/idevice.css diff --git a/vendor/pdfjs/css/images/annotation-check.svg b/public/pdfjs/css/images/annotation-check.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-check.svg rename to public/pdfjs/css/images/annotation-check.svg diff --git a/vendor/pdfjs/css/images/annotation-comment.svg b/public/pdfjs/css/images/annotation-comment.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-comment.svg rename to public/pdfjs/css/images/annotation-comment.svg diff --git a/vendor/pdfjs/css/images/annotation-help.svg b/public/pdfjs/css/images/annotation-help.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-help.svg rename to public/pdfjs/css/images/annotation-help.svg diff --git a/vendor/pdfjs/css/images/annotation-insert.svg b/public/pdfjs/css/images/annotation-insert.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-insert.svg rename to public/pdfjs/css/images/annotation-insert.svg diff --git a/vendor/pdfjs/css/images/annotation-key.svg b/public/pdfjs/css/images/annotation-key.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-key.svg rename to public/pdfjs/css/images/annotation-key.svg diff --git a/vendor/pdfjs/css/images/annotation-newparagraph.svg b/public/pdfjs/css/images/annotation-newparagraph.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-newparagraph.svg rename to public/pdfjs/css/images/annotation-newparagraph.svg diff --git a/vendor/pdfjs/css/images/annotation-noicon.svg b/public/pdfjs/css/images/annotation-noicon.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-noicon.svg rename to public/pdfjs/css/images/annotation-noicon.svg diff --git a/vendor/pdfjs/css/images/annotation-note.svg b/public/pdfjs/css/images/annotation-note.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-note.svg rename to public/pdfjs/css/images/annotation-note.svg diff --git a/vendor/pdfjs/css/images/annotation-paragraph.svg b/public/pdfjs/css/images/annotation-paragraph.svg similarity index 100% rename from vendor/pdfjs/css/images/annotation-paragraph.svg rename to public/pdfjs/css/images/annotation-paragraph.svg diff --git a/vendor/pdfjs/css/main.css b/public/pdfjs/css/main.css similarity index 100% rename from vendor/pdfjs/css/main.css rename to public/pdfjs/css/main.css diff --git a/vendor/pdfjs/css/normalize.css b/public/pdfjs/css/normalize.css similarity index 100% rename from vendor/pdfjs/css/normalize.css rename to public/pdfjs/css/normalize.css diff --git a/vendor/pdfjs/css/popup.css b/public/pdfjs/css/popup.css similarity index 100% rename from vendor/pdfjs/css/popup.css rename to public/pdfjs/css/popup.css diff --git a/vendor/pdfjs/css/sidebar.css b/public/pdfjs/css/sidebar.css similarity index 100% rename from vendor/pdfjs/css/sidebar.css rename to public/pdfjs/css/sidebar.css diff --git a/vendor/pdfjs/css/text_layer_builder.css b/public/pdfjs/css/text_layer_builder.css similarity index 100% rename from vendor/pdfjs/css/text_layer_builder.css rename to public/pdfjs/css/text_layer_builder.css diff --git a/vendor/pdfjs/lib/pdf.js b/public/pdfjs/lib/pdf.js similarity index 100% rename from vendor/pdfjs/lib/pdf.js rename to public/pdfjs/lib/pdf.js diff --git a/vendor/pdfjs/lib/pdf.worker.js b/public/pdfjs/lib/pdf.worker.js similarity index 100% rename from vendor/pdfjs/lib/pdf.worker.js rename to public/pdfjs/lib/pdf.worker.js diff --git a/vendor/pdfjs/lib/text_layer_builder.js b/public/pdfjs/lib/text_layer_builder.js similarity index 100% rename from vendor/pdfjs/lib/text_layer_builder.js rename to public/pdfjs/lib/text_layer_builder.js diff --git a/vendor/pdfjs/pdf.reader.js b/public/pdfjs/pdf.reader.js similarity index 100% rename from vendor/pdfjs/pdf.reader.js rename to public/pdfjs/pdf.reader.js diff --git a/vendor/pdfjs/services/eventbus_service.js b/public/pdfjs/services/eventbus_service.js similarity index 100% rename from vendor/pdfjs/services/eventbus_service.js rename to public/pdfjs/services/eventbus_service.js diff --git a/vendor/pdfjs/services/link_service.js b/public/pdfjs/services/link_service.js similarity index 100% rename from vendor/pdfjs/services/link_service.js rename to public/pdfjs/services/link_service.js diff --git a/vendor/pdfjs/services/simple_link_service.js b/public/pdfjs/services/simple_link_service.js similarity index 100% rename from vendor/pdfjs/services/simple_link_service.js rename to public/pdfjs/services/simple_link_service.js diff --git a/vendor/pixastic/pixastic.effects.js b/public/pixastic/pixastic.effects.js similarity index 100% rename from vendor/pixastic/pixastic.effects.js rename to public/pixastic/pixastic.effects.js diff --git a/vendor/pixastic/pixastic.js b/public/pixastic/pixastic.js similarity index 100% rename from vendor/pixastic/pixastic.js rename to public/pixastic/pixastic.js diff --git a/vendor/pixastic/pixastic.worker.control.js b/public/pixastic/pixastic.worker.control.js similarity index 100% rename from vendor/pixastic/pixastic.worker.control.js rename to public/pixastic/pixastic.worker.control.js diff --git a/vendor/pixastic/pixastic.worker.js b/public/pixastic/pixastic.worker.js similarity index 100% rename from vendor/pixastic/pixastic.worker.js rename to public/pixastic/pixastic.worker.js diff --git a/vendor/pixastic/pixastic_combined.js b/public/pixastic/pixastic_combined.js similarity index 94% rename from vendor/pixastic/pixastic_combined.js rename to public/pixastic/pixastic_combined.js index 0c7c5d4..c15fa5b 100644 --- a/vendor/pixastic/pixastic_combined.js +++ b/public/pixastic/pixastic_combined.js @@ -4,13 +4,13 @@ * Pixastic - JavaScript Image Processing * http://pixastic.com/ * Copyright 2012, Jacob Seidelin - * + * * Dual licensed under the MPL 1.1 or GPLv3 licenses. * http://pixastic.com/license-mpl.txt * http://pixastic.com/license-gpl-3.0.txt * */ - + var Pixastic = (function() { var worker; @@ -22,14 +22,14 @@ return ctx.getImageData(0, 0, width, height); } } - + function Pixastic(ctx, workerControlPath) { var P = {}, - width = ctx.canvas.width, + width = ctx.canvas.width, height = ctx.canvas.height, queue = [], - workerControlPath = workerControlPath || "vendor/pixastic/"; + workerControlPath = workerControlPath || "public/pixastic/"; if (!worker) { if (typeof window.Worker != "undefined") { @@ -47,7 +47,7 @@ worker = new Pixastic.Worker(); } } - + for (var e in Pixastic.Effects) { if (Pixastic.Effects.hasOwnProperty(e)) { (function(e) { @@ -61,7 +61,7 @@ P.done = function(callback, progress) { var inData, outData; - + try { inData = ctx.getImageData(0, 0, width, height); } catch(e) { @@ -71,21 +71,21 @@ throw new Error("Could not access image data, is canvas tainted by cross-origin data?"); } } - + outData = createImageData(ctx, width, height); - + worker.postMessage({ - queue : queue, - inData : inData, + queue : queue, + inData : inData, outData : outData, width : width, height : height }); - + worker.onmessage = function(message) { var d = message.data; switch (d.event) { - case "done" : + case "done" : ctx.putImageData(d.data, 0, 0); if (callback) { callback(); @@ -103,7 +103,7 @@ break; } }; - + if (progress) { progress(0); } @@ -149,7 +149,7 @@ } Pixastic.Effects[e](inData.data, outData.data, width, height, options, progressCallback); - + me.onmessage({ data : { event : "progress", @@ -157,7 +157,7 @@ } }); } - + me.onmessage({ data : { event : "done", @@ -171,19 +171,19 @@ processMessage(data) }, 0); }; - + this.onmessage = function() {}; }; - + Pixastic.log = function(str) { if (typeof console != "undefined" && console.log) { console.log("Pixastic: " + str); } }; - + function toCanvas(o) { var canvas; if (typeof o == "object") { @@ -224,34 +224,34 @@ round = Math.round, maxValue, n = imageData.width * imageData.height; - + for (i=0;i<256;i++) { values[i] = 0; } - + for (i=0;i maxValue) { maxValue = values[i]; } } - + return { maxValue : maxValue, values : values }; } - + Pixastic.toCanvas = toCanvas; Pixastic.toImage = toImage; Pixastic.toImageData = toImageData; Pixastic.histogram = histogram; - + Pixastic.Color = { rgb2hsl : function(r, g, b) { if (r < 0) r = 0; @@ -261,16 +261,16 @@ if (g > 255) g = 0; if (b > 255) b = 0; }, - + rgb2hsv : function(r, g, b) { }, rgb2hex : function(r, g, b) { }, - + hsl2rgb : function(h, s, l) { }, - + hsv2rgb : function(h, s, v) { } @@ -304,18 +304,18 @@ Pixastic.Effects = (function() { pyc, pyp, pyn, pxc, pxp, pxn, x, y, - + prog, lastProg = 0, n = width * height * 4, - + k00 = kernel[0][0], k01 = kernel[0][1], k02 = kernel[0][2], k10 = kernel[1][0], k11 = kernel[1][1], k12 = kernel[1][2], k20 = kernel[2][0], k21 = kernel[2][1], k22 = kernel[2][2], - + p00, p01, p02, p10, p11, p12, p20, p21, p22; - + for (y=0;y= width-1) pyn = pyc; - + for (x=0;x= width-1) pxn = pxc; - + p00 = pyp + pxp; p01 = pyp + pxc; p02 = pyp + pxn; p10 = pyc + pxp; p11 = pyc + pxc; p12 = pyc + pxn; p20 = pyn + pxp; p21 = pyn + pxc; p22 = pyn + pxn; @@ -345,7 +345,7 @@ Pixastic.Effects = (function() { g = inData[p00 + 1] * k00 + inData[p01 + 1] * k01 + inData[p02 + 1] * k02 + inData[p10 + 1] * k10 + inData[p11 + 1] * k11 + inData[p12 + 1] * k12 + inData[p20 + 1] * k20 + inData[p21 + 1] * k21 + inData[p22 + 1] * k22; - + b = inData[p00 + 2] * k00 + inData[p01 + 2] * k01 + inData[p02 + 2] * k02 + inData[p10 + 2] * k10 + inData[p11 + 2] * k11 + inData[p12 + 2] * k12 + inData[p20 + 2] * k20 + inData[p21 + 2] * k21 + inData[p22 + 2] * k22; @@ -366,12 +366,12 @@ Pixastic.Effects = (function() { g = 255 - g; b = 255 - b; } - + outData[idx] = r; outData[idx+1] = g; outData[idx+2] = b; outData[idx+3] = a; - + if (progress) { prog = (idx/n*100 >> 0) / 100; if (prog > lastProg) { @@ -381,28 +381,28 @@ Pixastic.Effects = (function() { } } } - + function convolve5x5(inData, outData, width, height, kernel, progress, alpha, invert, mono) { var idx, r, g, b, a, pyc, pyp, pyn, pypp, pynn, pxc, pxp, pxn, pxpp, pxnn, x, y, - + prog, lastProg = 0, n = width * height * 4, - + k00 = kernel[0][0], k01 = kernel[0][1], k02 = kernel[0][2], k03 = kernel[0][3], k04 = kernel[0][4], k10 = kernel[1][0], k11 = kernel[1][1], k12 = kernel[1][2], k13 = kernel[1][3], k14 = kernel[1][4], k20 = kernel[2][0], k21 = kernel[2][1], k22 = kernel[2][2], k23 = kernel[2][3], k24 = kernel[2][4], k30 = kernel[3][0], k31 = kernel[3][1], k32 = kernel[3][2], k33 = kernel[3][3], k34 = kernel[3][4], k40 = kernel[4][0], k41 = kernel[4][1], k42 = kernel[4][2], k43 = kernel[4][3], k44 = kernel[4][4], - + p00, p01, p02, p03, p04, p10, p11, p12, p13, p14, p20, p21, p22, p23, p24, p30, p31, p32, p33, p34, p40, p41, p42, p43, p44; - + for (y=0;y= width-1) pyn = pyc; if (y < 2) pypp = pyp; if (y >= width-2) pynn = pyn; - + for (x=0;x= width-1) pxn = pxc; if (x < 2) pxpp = pxp; if (x >= width-2) pxnn = pxn; - + p00 = pypp + pxpp; p01 = pypp + pxp; p02 = pypp + pxc; p03 = pypp + pxn; p04 = pypp + pxnn; p10 = pyp + pxpp; p11 = pyp + pxp; p12 = pyp + pxc; p13 = pyp + pxn; p14 = pyp + pxnn; p20 = pyc + pxpp; p21 = pyc + pxp; p22 = pyc + pxc; p23 = pyc + pxn; p24 = pyc + pxnn; @@ -440,13 +440,13 @@ Pixastic.Effects = (function() { + inData[p20] * k20 + inData[p21] * k21 + inData[p22] * k22 + inData[p23] * k24 + inData[p22] * k24 + inData[p30] * k30 + inData[p31] * k31 + inData[p32] * k32 + inData[p33] * k34 + inData[p32] * k34 + inData[p40] * k40 + inData[p41] * k41 + inData[p42] * k42 + inData[p43] * k44 + inData[p42] * k44; - + g = inData[p00+1] * k00 + inData[p01+1] * k01 + inData[p02+1] * k02 + inData[p03+1] * k04 + inData[p02+1] * k04 + inData[p10+1] * k10 + inData[p11+1] * k11 + inData[p12+1] * k12 + inData[p13+1] * k14 + inData[p12+1] * k14 + inData[p20+1] * k20 + inData[p21+1] * k21 + inData[p22+1] * k22 + inData[p23+1] * k24 + inData[p22+1] * k24 + inData[p30+1] * k30 + inData[p31+1] * k31 + inData[p32+1] * k32 + inData[p33+1] * k34 + inData[p32+1] * k34 + inData[p40+1] * k40 + inData[p41+1] * k41 + inData[p42+1] * k42 + inData[p43+1] * k44 + inData[p42+1] * k44; - + b = inData[p00+2] * k00 + inData[p01+2] * k01 + inData[p02+2] * k02 + inData[p03+2] * k04 + inData[p02+2] * k04 + inData[p10+2] * k10 + inData[p11+2] * k11 + inData[p12+2] * k12 + inData[p13+2] * k14 + inData[p12+2] * k14 + inData[p20+2] * k20 + inData[p21+2] * k21 + inData[p22+2] * k22 + inData[p23+2] * k24 + inData[p22+2] * k24 @@ -466,18 +466,18 @@ Pixastic.Effects = (function() { if (mono) { r = g = b = (r + g + b) / 3; } - + if (invert) { r = 255 - r; g = 255 - g; b = 255 - b; } - + outData[idx] = r; outData[idx+1] = g; outData[idx+2] = b; outData[idx+3] = a; - + if (progress) { prog = (idx/n*100 >> 0) / 100; if (prog > lastProg) { @@ -487,11 +487,11 @@ Pixastic.Effects = (function() { } } } - + function gaussian(inData, outData, width, height, kernelSize, progress) { var r, g, b, a, idx, n = width * height * 4, - x, y, i, j, + x, y, i, j, inx, iny, w, tmpData = [], maxKernelSize = 13, @@ -501,12 +501,12 @@ Pixastic.Effects = (function() { weights, kernels = [[1]], prog, lastProg = 0; - - + + for (i=1;i= width) { inx = width - 1; } - + idx = (iny * width + inx) * 4; r += inData[idx] * w; @@ -548,14 +548,14 @@ Pixastic.Effects = (function() { a += inData[idx + 3] * w; } - + idx = (y * width + x) * 4; - + tmpData[idx] = r; tmpData[idx+1] = g; tmpData[idx+2] = b; tmpData[idx+3] = a; - + if (progress) { prog = (idx/n*50 >> 0) / 100; if (prog > lastProg) { @@ -564,9 +564,9 @@ Pixastic.Effects = (function() { } } } - + lastProg = 0; - + // pass 2 for (y=0;y= height) { iny = height - 1; } - + idx = (iny * width + inx) * 4; - + r += tmpData[idx] * w; g += tmpData[idx + 1] * w; b += tmpData[idx + 2] * w; a += tmpData[idx + 3] * w; } - + idx = (y * width + x) * 4; - + outData[idx] = r; outData[idx+1] = g; outData[idx+2] = b; outData[idx+3] = a; - + if (progress) { prog = 0.5 + (idx/n*50 >> 0) / 100; if (prog > lastProg) { @@ -608,8 +608,8 @@ Pixastic.Effects = (function() { } } } - - + + return { invert : function(inData, outData, width, height, options, progress) { @@ -622,7 +622,7 @@ Pixastic.Effects = (function() { outData[i+2] = 255 - inData[i+2]; outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -631,7 +631,7 @@ Pixastic.Effects = (function() { } } }, - + sepia : function(inData, outData, width, height, options, progress) { var n = width * height * 4, prog, lastProg = 0, @@ -645,7 +645,7 @@ Pixastic.Effects = (function() { outData[i+1] = (r * 0.349 + g * 0.686 + b * 0.168); outData[i+2] = (r * 0.272 + g * 0.534 + b * 0.131); outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -654,7 +654,7 @@ Pixastic.Effects = (function() { } } }, - + solarize : function(inData, outData, width, height, options, progress) { var n = width * height * 4, prog, lastProg = 0, @@ -664,12 +664,12 @@ Pixastic.Effects = (function() { r = inData[i]; g = inData[i+1]; b = inData[i+2]; - + outData[i] = r > 127 ? 255 - r : r; outData[i+1] = g > 127 ? 255 - g : g; outData[i+2] = b > 127 ? 255 - b : b; outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -684,7 +684,7 @@ Pixastic.Effects = (function() { brightness : 0, contrast : 0 }); - + var contrast = clamp(options.contrast, -1, 1) / 2, brightness = 1 + clamp(options.brightness, -1, 1), prog, lastProg = 0, @@ -701,16 +701,16 @@ Pixastic.Effects = (function() { r = inData[i]; g = inData[i+1]; b = inData[i+2]; - + r = (r + r * brightMul + brightAdd) * contrast + contrastAdd; g = (g + g * brightMul + brightAdd) * contrast + contrastAdd; b = (b + b * brightMul + brightAdd) * contrast + contrastAdd; - + outData[i] = r; outData[i+1] = g; outData[i+2] = b; outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -719,7 +719,7 @@ Pixastic.Effects = (function() { } } }, - + desaturate : function(inData, outData, width, height, options, progress) { var n = width * height * 4, prog, lastProg = 0, @@ -731,7 +731,7 @@ Pixastic.Effects = (function() { outData[i+1] = level; outData[i+2] = level; outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -740,7 +740,7 @@ Pixastic.Effects = (function() { } } }, - + lighten : function(inData, outData, width, height, options, progress) { var n = width * height * 4, prog, lastProg = 0, @@ -751,7 +751,7 @@ Pixastic.Effects = (function() { outData[i+1] = inData[i+1] * mul; outData[i+2] = inData[i+2] * mul; outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -760,7 +760,7 @@ Pixastic.Effects = (function() { } } }, - + noise : function(inData, outData, width, height, options, progress) { var n = width * height * 4, prog, lastProg = 0, @@ -769,14 +769,14 @@ Pixastic.Effects = (function() { mono = !!options.mono, random = Math.random, rnd, r, g, b; - + for (var i=0;i> 0) / 100; if (prog > lastProg) { @@ -803,7 +803,7 @@ Pixastic.Effects = (function() { } } }, - + flipv : function(inData, outData, width, height, options, progress) { var inPix, outPix, n = width * height * 4, @@ -813,12 +813,12 @@ Pixastic.Effects = (function() { for (x=0;x> 0) / 100; if (prog > lastProg) { @@ -828,7 +828,7 @@ Pixastic.Effects = (function() { } } }, - + fliph : function(inData, outData, width, height, options, progress) { var inPix, outPix, n = width * height * 4, @@ -838,12 +838,12 @@ Pixastic.Effects = (function() { for (x=0;x> 0) / 100; if (prog > lastProg) { @@ -872,9 +872,9 @@ Pixastic.Effects = (function() { return p; } } - + gaussian(inData, tmpData, width, height, options.kernelSize, gaussProgress); - + for (i=0;i> 0) / 100 * 0.2; if (prog > lastProg) { @@ -899,16 +899,16 @@ Pixastic.Effects = (function() { convolve3x3 : function(inData, outData, width, height, options, progress) { convolve3x3(inData, outData, width, height, options.kernel, progress); }, - + convolve5x5 : function(inData, outData, width, height, options, progress) { convolve5x5(inData, outData, width, height, options.kernel, progress); }, - + // A 3x3 high-pass filter sharpen3x3 : function(inData, outData, width, height, options, progress) { var a = - clamp(options.strength, 0, 1); convolve3x3( - inData, outData, width, height, + inData, outData, width, height, [[a, a, a], [a, 1-a*8, a], [a, a, a]], @@ -920,7 +920,7 @@ Pixastic.Effects = (function() { sharpen5x5 : function(inData, outData, width, height, options, progress) { var a = - clamp(options.strength, 0, 1); convolve5x5( - inData, outData, width, height, + inData, outData, width, height, [[a, a, a, a, a], [a, a, a, a, a], [a, a, 1-a*24, a, a], @@ -934,19 +934,19 @@ Pixastic.Effects = (function() { soften3x3 : function(inData, outData, width, height, options, progress) { var c = 1/9; convolve3x3( - inData, outData, width, height, + inData, outData, width, height, [[c, c, c], [c, c, c], [c, c, c]], progress ); }, - + // A 5x5 low-pass mean filter soften5x5 : function(inData, outData, width, height, options, progress) { var c = 1/25; convolve5x5( - inData, outData, width, height, + inData, outData, width, height, [[c, c, c, c, c], [c, c, c, c, c], [c, c, c, c, c], @@ -955,12 +955,12 @@ Pixastic.Effects = (function() { progress ); }, - + // A 3x3 Cross edge-detect crossedges : function(inData, outData, width, height, options, progress) { var a = clamp(options.strength, 0, 1) * 5; convolve3x3( - inData, outData, width, height, + inData, outData, width, height, [[ 0, -a, 0], [-a, 0, a], [ 0, a, 0]], @@ -968,7 +968,7 @@ Pixastic.Effects = (function() { false, true ); }, - + // 3x3 directional emboss emboss : function(inData, outData, width, height, options, progress) { var amount = options.amount, @@ -976,7 +976,7 @@ Pixastic.Effects = (function() { x = Math.cos(-angle) * amount, y = Math.sin(-angle) * amount, n = width * height * 4, - + a00 = -x - y, a10 = -x, a20 = y - x, @@ -987,30 +987,30 @@ Pixastic.Effects = (function() { a22 = y + x, tmpData = [], - + prog, lastProg = 0, convProgress; - + if (progress) { convProgress = function(p) { progress(p * 0.5); return p; }; } - + convolve3x3( - inData, tmpData, width, height, + inData, tmpData, width, height, [[a00, a01, a02], [a10, 0, a12], [a20, a21, a22]] ); - + for (var i=0;i> 0) / 100 * 0.5; if (prog > lastProg) { @@ -1020,12 +1020,12 @@ Pixastic.Effects = (function() { } }, - + // A 3x3 Sobel edge detect (similar to Photoshop's) findedges : function(inData, outData, width, height, options, progress) { var n = width * height * 4, i, - data1 = [], + data1 = [], data2 = [], gr1, gr2, gg1, gg2, gb1, gb2, prog, lastProg = 0, @@ -1041,18 +1041,18 @@ Pixastic.Effects = (function() { return p; }; } - - convolve3x3(inData, data1, width, height, + + convolve3x3(inData, data1, width, height, [[-1, 0, 1], [-2, 0, 2], [-1, 0, 1]] ); - convolve3x3(inData, data2, width, height, + convolve3x3(inData, data2, width, height, [[-1, -2, -1], [ 0, 0, 0], [ 1, 2, 1]] ); - + for (i=0;i> 0) / 100 * 0.2; if (prog > lastProg) { @@ -1081,22 +1081,22 @@ Pixastic.Effects = (function() { } } }, - + // A 3x3 edge enhance edgeenhance3x3 : function(inData, outData, width, height, options, progress) { convolve3x3( - inData, outData, width, height, + inData, outData, width, height, [[-1/9, -1/9, -1/9], [-1/9, 17/9, -1/9], [-1/9, -1/9, -1/9]], progress ); }, - + // A 5x5 edge enhance edgeenhance5x5 : function(inData, outData, width, height, options, progress) { convolve5x5( - inData, outData, width, height, + inData, outData, width, height, [[-1/25, -1/25, -1/25, -1/25, -1/25], [-1/25, -1/25, -1/25, -1/25, -1/25], [-1/25, -1/25, 49/25, -1/25, -1/25], @@ -1109,7 +1109,7 @@ Pixastic.Effects = (function() { // A 3x3 Laplacian edge-detect laplace3x3 : function(inData, outData, width, height, options, progress) { convolve3x3( - inData, outData, width, height, + inData, outData, width, height, [[-1, -1, -1], [-1, 8, -1], [-1, -1, -1]], @@ -1117,11 +1117,11 @@ Pixastic.Effects = (function() { false, true, true ); }, - + // A 5x5 Laplacian edge-detect laplace5x5 : function(inData, outData, width, height, options, progress) { convolve5x5( - inData, outData, width, height, + inData, outData, width, height, [[-1, -1, -1, -1, -1], [-1, -1, -1, -1, -1], [-1, -1, 24, -1, -1], @@ -1131,7 +1131,7 @@ Pixastic.Effects = (function() { false, true, true ); }, - + coloradjust : function(inData, outData, width, height, options, progress) { var n = width * height * 4, r, g, b, @@ -1154,7 +1154,7 @@ Pixastic.Effects = (function() { outData[i+1] = g; outData[i+2] = b; outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -1163,7 +1163,7 @@ Pixastic.Effects = (function() { } } }, - + colorfilter : function(inData, outData, width, height, options, progress) { var n = width * height * 4, i, r, g, b, @@ -1173,14 +1173,14 @@ Pixastic.Effects = (function() { ar = clamp(options.r, 0, 1), ag = clamp(options.g, 0, 1), ab = clamp(options.b, 0, 1); - + for (i=0;i> 0; tmp = chroma * (h - h1); r = g = b = l - (r * 0.3 + g * 0.59 + b * 0.11); - + if (h1 == 0) { - r += chroma; + r += chroma; g += tmp; } else if (h1 == 1) { r += chroma - tmp; @@ -1230,7 +1230,7 @@ Pixastic.Effects = (function() { outData[i+1] = g * 255; outData[i+2] = b * 255; outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -1239,7 +1239,7 @@ Pixastic.Effects = (function() { } } }, - + hsl : function(inData, outData, width, height, options, progress) { var n = width * height * 4, hue = clamp(options.hue, -1, 1), @@ -1252,15 +1252,15 @@ Pixastic.Effects = (function() { prog, lastProg = 0; hue = (hue * 6) % 6; - + for (var i=0;i 0 && vm > 0) { if (l <= 0.5) { s = vm / (vs+ms) * satMul; @@ -1307,7 +1307,7 @@ Pixastic.Effects = (function() { sextant = h >> 0; vmh = (v - m) * (h - sextant); if (sextant == 0) { - r = v; + r = v; g = m + vmh; b = m; } else if (sextant == 1) { @@ -1331,29 +1331,29 @@ Pixastic.Effects = (function() { g = m; b = v - vmh; } - + r *= 255; g *= 255; b *= 255; } } - + r = r * lightMul + lightAdd; g = g * lightMul + lightAdd; b = b * lightMul + lightAdd; - + if (r < 0) r = 0; if (g < 0) g = 0; if (b < 0) b = 0; if (r > 255) r = 255; if (g > 255) g = 255; if (b > 255) b = 255; - + outData[i] = r; outData[i+1] = g; outData[i+2] = b; outData[i+3] = inData[i+3]; - + if (progress) { prog = (i/n*100 >> 0) / 100; if (prog > lastProg) { @@ -1362,7 +1362,7 @@ Pixastic.Effects = (function() { } } }, - + posterize : function(inData, outData, width, height, options, progress) { var numLevels = clamp(options.levels, 2, 256), numAreas = 256 / numLevels, @@ -1372,11 +1372,11 @@ Pixastic.Effects = (function() { prog, lastProg = 0; for (i=0;i>0); - outData[i+1] = numValues * ((inData[i+1] / numAreas)>>0); - outData[i+2] = numValues * ((inData[i+2] / numAreas)>>0); - + outData[i+1] = numValues * ((inData[i+1] / numAreas)>>0); + outData[i+2] = numValues * ((inData[i+2] / numAreas)>>0); + outData[i+3] = inData[i+3]; if (progress) { @@ -1386,18 +1386,18 @@ Pixastic.Effects = (function() { } } } - + }, - + removenoise : function(inData, outData, width, height, options, progress) { var r, g, b, c, y, x, idx, pyc, pyp, pyn, pxc, pxp, pxn, minR, minG, minB, maxR, maxG, maxB, n, prog, lastProg = 0; - + n = width * height * 4; - + for (y=0;y= width-1) pyn = pyc; - + for (x=0;x= width-1) pxn = pxc; - + minR = maxR = inData[pyc + pxp]; c = inData[pyc + pxn]; if (c < minR) minR = c; @@ -1434,7 +1434,7 @@ Pixastic.Effects = (function() { if (c < minG) minG = c; c = inData[pyn + pxc + 1]; if (c < minG) minG = c; - + minB = inData[pyc + pxp + 2]; c = inData[pyc + pxn + 2]; if (c < minB) minB = c; @@ -1446,19 +1446,19 @@ Pixastic.Effects = (function() { r = inData[idx]; g = inData[idx + 1]; b = inData[idx + 2]; - + if (r < minR) r = minR; if (r > maxR) r = maxR; if (g < minG) g = minG; if (g > maxG) g = maxG; if (b < minB) b = minB; if (b > maxB) b = maxB; - + outData[idx] = r; outData[idx+1] = g; outData[idx+2] = b; outData[idx+3] = inData[idx+3]; - + if (progress) { prog = (idx/n*100 >> 0) / 100; if (prog > lastProg) { @@ -1580,7 +1580,7 @@ Pixastic.Worker = function() { } Pixastic.Effects[e](inData.data, outData.data, width, height, options); - + me.onmessage({ data : { event : "progress", @@ -1588,7 +1588,7 @@ Pixastic.Worker = function() { } }); } - + me.onmessage({ data : { event : "done", @@ -1602,7 +1602,7 @@ Pixastic.Worker = function() { processMessage(data) }, 0); }; - + this.onmessage = function() {}; }; diff --git a/vendor/sindresorhus/screenfull.js b/public/sindresorhus/screenfull.js similarity index 100% rename from vendor/sindresorhus/screenfull.js rename to public/sindresorhus/screenfull.js diff --git a/templates/cbreader.php b/templates/cbreader.php index 847fa29..1f23288 100644 --- a/templates/cbreader.php +++ b/templates/cbreader.php @@ -37,16 +37,16 @@ $nonce = class_exists('\OC\Security\CSP\ContentSecurityPolicyNonceManager') - - - - - - - + + + + + + + - + diff --git a/templates/epubreader.php b/templates/epubreader.php index 441124b..68e5397 100644 --- a/templates/epubreader.php +++ b/templates/epubreader.php @@ -37,26 +37,26 @@ $nonce = class_exists('\OC\Security\CSP\ContentSecurityPolicyNonceManager') - - - - + + + + - - - - - - - - - + + + + + + + + + - - - + + + diff --git a/templates/pdfreader.php b/templates/pdfreader.php index bb63421..32cfcb9 100644 --- a/templates/pdfreader.php +++ b/templates/pdfreader.php @@ -37,38 +37,38 @@ $nonce = class_exists('\OC\Security\CSP\ContentSecurityPolicyNonceManager') - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + +