Fixed epub view init not resuming from last position

Author: svera

internal/webserver/embedded/js/foliate-js/reader.js renamed to internal/webserver/embedded/js/reader.js

@@ -1,7 +1,7 @@
-import './view.js'
-import { createTOCView } from './ui/tree.js'
-import { createMenu } from './ui/menu.js'
-import { Overlayer } from './overlayer.js'
+import './foliate-js/view.js'
+import { createTOCView } from './foliate-js/ui/tree.js'
+import { createMenu } from './foliate-js/ui/menu.js'
+import { Overlayer } from './foliate-js/overlayer.js'
 
 const isZip = async file => {
     const arr = new Uint8Array(await file.slice(0, 4).arrayBuffer())
@@ -17,7 +17,7 @@ const isPDF = async file => {
 
 const makeZipLoader = async file => {
     const { configure, ZipReader, BlobReader, TextWriter, BlobWriter } =
-        await import('./vendor/zip.js')
+        await import('./foliate-js/vendor/zip.js')
     configure({ useWebWorkers: false })
     const reader = new ZipReader(new BlobReader(file))
     const entries = await reader.getEntries()
@@ -35,19 +35,19 @@ const getView = async file => {
     if (!file.size) throw new Error('File not found')
     else if (await isZip(file)) {
         const loader = await makeZipLoader(file)
-        const { EPUB } = await import('./epub.js')
+        const { EPUB } = await import('./foliate-js/epub.js')
         book = await new EPUB(loader).init()
     }
     else if (await isPDF(file)) {
-        const { makePDF } = await import('./pdf.js')
+        const { makePDF } = await import('./foliate-js/pdf.js')
         book = await makePDF(file)
     }
     if (!book) throw new Error('File type not supported')
     const view = document.createElement('foliate-view')
     const storage = window.localStorage
     document.body.append(view)
     await view.open(book)
-    view.init({lastLocation: storage.getItem("loc")})
+    await view.init({lastLocation: storage.getItem("loc")})
     return view
 }
 
@@ -185,7 +185,7 @@ class Reader {
         // load and show highlights embedded in the file by Calibre
         const bookmarks = await book.getCalibreBookmarks?.()
         if (bookmarks) {
-            const { fromCalibreHighlight } = await import('./epubcfi.js')
+            const { fromCalibreHighlight } = await import('./foliate-js/epubcfi.js')
             for (const obj of bookmarks) {
                 if (obj.type === 'highlight') {
                     const value = fromCalibreHighlight(obj)

internal/webserver/embedded/views/reader.html

@@ -79,4 +79,4 @@
 }}</script>
 
 <script src="/js/foliate-js/vendor/pdfjs/pdf.js"></script>
-<script src="/js/foliate-js/reader.js" type="module"></script>
+<script src="/js/reader.js" type="module"></script>