@internetarchive/bookreader 5.0.0-6-multiple-files → 5.0.0-60

package/src/plugins/plugin.chapters.js

@@ -36,14 +36,12 @@ BookReader.prototype.init = (function(super_) {
             this.updateTOCState(this.firstIndex, this._tocEntries);
           }
         }
-      )
-      $(".BRmobileMenu__tableContents").click(
-        () => {
-          this.updateTOCState(this.firstIndex, this._tocEntries);
-        }
       );
+      $(".BRmobileMenu__tableContents").on("click", () => {
+        this.updateTOCState(this.firstIndex, this._tocEntries);
+      });
     }
-  }
+  };
 })(BookReader.prototype.init);
 
 /**
@@ -55,12 +53,12 @@ BookReader.prototype.init = (function(super_) {
  */
 BookReader.prototype.addChapter = function(chapterTitle, pageNumber, pageIndex) {
   const uiStringPage = 'Page'; // i18n
-  const percentThrough = BookReader.util.cssPercentage(pageIndex, this.getNumLeafs() - 1);
+  const percentThrough = BookReader.util.cssPercentage(pageIndex, this.book.getNumLeafs() - 1);
   const jumpToChapter = (event) => {
     this.jumpToIndex($(event.delegateTarget).data('pageIndex'));
     $('.current-chapter').removeClass('current-chapter');
     $(event.delegateTarget).addClass('current-chapter');
-  }
+  };
   const title = `${chapterTitle} | `;
   const pageStr = `${uiStringPage} ${pageNumber}`;
 
@@ -79,7 +77,7 @@ BookReader.prototype.addChapter = function(chapterTitle, pageNumber, pageIndex)
       .css({ left: percentThrough })
       .appendTo(this.$('.BRnavline'))
       .data({ pageIndex })
-      .hover(event => {
+      .on("mouseenter", event => {
         // remove hover effect from other markers then turn on just for this
         const marker = event.currentTarget;
         const tooltip = marker.querySelector('div');
@@ -91,9 +89,8 @@ BookReader.prototype.addChapter = function(chapterTitle, pageNumber, pageIndex)
         }
         this.$('.BRsearch,.BRchapter').removeClass('front');
         $(event.target).addClass('front');
-      },
-      event => $(event.target).removeClass('front')
-      )
+      })
+      .on("mouseleave", event => $(event.target).removeClass('front'))
       .on('click', jumpToChapter);
 
     //adding clickable properties to mobile chapters
@@ -126,7 +123,7 @@ BookReader.prototype.updateTOC = function(tocEntries) {
   this._tocEntries = tocEntries;
   $('.table-contents-list').children().each((i, el) => {
     tocEntries[i].mobileHTML = el;
-  })
+  });
 };
 
 /**
@@ -154,7 +151,7 @@ BookReader.prototype.updateTOC = function(tocEntries) {
  * @param {TocEntry} tocEntryObject
  */
 BookReader.prototype.addChapterFromEntry = function(tocEntryObject) {
-  tocEntryObject.pageIndex = this.getPageIndex(tocEntryObject['pagenum']);
+  tocEntryObject.pageIndex = this.book.getPageIndex(tocEntryObject['pagenum']);
   //creates a string with non-void tocEntryObject.label and tocEntryObject.title
   const chapterStr = [tocEntryObject.label, tocEntryObject.title]
     .filter(x => x)
@@ -162,9 +159,9 @@ BookReader.prototype.addChapterFromEntry = function(tocEntryObject) {
   this.addChapter(chapterStr, tocEntryObject['pagenum'], tocEntryObject.pageIndex);
   this.$('.BRchapter, .BRsearch').each((i, el) => {
     const $el = $(el);
-    $el.hover(
-      () => $el.addClass('front'),
-      () => $el.removeClass('front'));
+    $el
+      .on("mouseenter", () => $el.addClass('front'))
+      .on("mouseleave", () => $el.removeClass('front'));
   });
 };
 
@@ -177,7 +174,7 @@ BookReader.prototype.addChapterFromEntry = function(tocEntryObject) {
  * This makes a call to OL API and calls the given callback function with the
  * response from the API.
  */
-BookReader.prototype.getOpenLibraryRecord = function () {
+BookReader.prototype.getOpenLibraryRecord = async function () {
   // Try looking up by ocaid first, then by source_record
   const baseURL = `${this.olHost}/query.json?type=/type/edition&*=`;
   const fetchUrlByBookId = `${baseURL}&ocaid=${this.bookId}`;
@@ -193,21 +190,17 @@ BookReader.prototype.getOpenLibraryRecord = function () {
     }
   };
 
-  $.ajax({ url: fetchUrlByBookId, dataType: 'jsonp' })
-    .then(data => {
-      if (data && data.length > 0) {
-        return data;
-      } else {
-      // try sourceid
-        return $.ajax({ url: `${baseURL}&source_records=ia:${this.bookId}`, dataType: 'jsonp' });
-      }
-    })
-    .then(data => {
-      if (data && data.length > 0) {
-        setUpChapterMarkers(data[0]);
-      }
-    });
-}
+  let data = await $.ajax({ url: fetchUrlByBookId, dataType: 'jsonp' });
+
+  if (!data || !data.length) {
+    // try sourceid
+    data = await $.ajax({ url: `${baseURL}&source_records=ia:${this.bookId}`, dataType: 'jsonp' });
+  }
+
+  if (data && data.length > 0) {
+    setUpChapterMarkers(data[0]);
+  }
+};
 
 // Extend buildMobileDrawerElement with table of contents list
 BookReader.prototype.buildMobileDrawerElement = (function (super_) {
@@ -240,7 +233,7 @@ BookReader.prototype.buildMobileDrawerElement = (function (super_) {
  */
 BookReader.prototype.updateTOCState = function(currIndex, tocEntries) {
   //this function won't have any effects if called before OpenLibrary request is finished
-  if (!tocEntries) {return}
+  if (!tocEntries) {return;}
   $('.current-chapter').removeClass('current-chapter');
   const tocEntriesIndexed = tocEntries.filter((el) => el.pageIndex != undefined).reverse();
   const currChapter = tocEntriesIndexed[tocEntriesIndexed.findIndex(
@@ -248,4 +241,4 @@ BookReader.prototype.updateTOCState = function(currIndex, tocEntries) {
   if (currChapter != undefined) {
     $(currChapter.mobileHTML).addClass('current-chapter');
   }
-}
+};

package/src/plugins/plugin.mobile_nav.js

@@ -25,7 +25,7 @@ const FILTERLIST = [
     filter: "contrast(120%)",
     label: "High contrast"
   },
-]
+];
 
 jQuery.extend(BookReader.defaultOptions, {
   enableMobileNav: true,
@@ -86,15 +86,16 @@ BookReader.prototype.initToolbar = (function (super_) {
       });
 
       //apply filters when checkboxs clicked
-      $drawerEl.find('.BRcheckbox-filters').click(() => applyFilters($drawerEl, this));
+      $drawerEl.find('.BRcheckbox-filters')
+        .on("click", () => applyFilters($drawerEl, this));
 
       // Bind mobile switch buttons
-      $drawerEl.find('.DrawerLayoutButton.one_page_mode').click(
-        () => this.switchMode(this.constMode1up));
-      $drawerEl.find('.DrawerLayoutButton.two_page_mode').click(
-        () => this.switchMode(this.constMode2up));
-      $drawerEl.find('.DrawerLayoutButton.thumbnail_mode').click(
-        () => this.switchMode(this.constModeThumb));
+      $drawerEl.find('.DrawerLayoutButton.one_page_mode')
+        .on("click", () => this.switchMode(this.constMode1up));
+      $drawerEl.find('.DrawerLayoutButton.two_page_mode')
+        .on("click", () => this.switchMode(this.constMode2up));
+      $drawerEl.find('.DrawerLayoutButton.thumbnail_mode')
+        .on("click", () => this.switchMode(this.constModeThumb));
 
       if (this.mobileNavFullscreenOnly) {
         $(document.body).addClass('BRbodyMobileNavEnabledFullscreen');
@@ -178,7 +179,7 @@ BookReader.prototype.buildMobileDrawerElement = function() {
         
       `;
       experimentalHtml = experimentalHtml.concat(checkboxHtml);
-    })
+    });
     experimentalHtml = experimentalHtml.concat("</div>");
   }
 
@@ -284,4 +285,4 @@ const applyFilters = (drawerEl, br) => {
             filter: ${filterStr};
             -webkit-filter: ${filterStr};}`;
   document.body.appendChild(filtersSheet);
-}
+};

package/src/plugins/plugin.resume.js

@@ -37,7 +37,7 @@ BookReader.prototype.getResumeValue = function() {
   const val = BookReader.docCookies.getItem('br-resume');
   if (val !== null) return parseInt(val);
   else return null;
-}
+};
 
 /**
  * Return cookie path using pathname up to /page/... or /mode/...
@@ -49,7 +49,7 @@ BookReader.prototype.getResumeValue = function() {
  */
 BookReader.prototype.getCookiePath = function(urlPathPart) {
   return urlPathPart.match('.+?(?=/page/|/mode/|$)')[0];
-}
+};
 
 /**
  * Sets page resume value, for remembering reader's page
@@ -65,4 +65,4 @@ BookReader.prototype.updateResumeValue = function(index, cookieName) {
   const path = this.options.resumeCookiePath
     || this.getCookiePath(window.location.pathname);
   BookReader.docCookies.setItem(cookieName || 'br-resume', index, ttl, path, null, false);
-}
+};

package/src/plugins/plugin.text_selection.js

@@ -1,7 +1,9 @@
 //@ts-check
+import { createSVGPageLayer } from '../BookReader/PageContainer.js';
 import { isFirefox, isSafari } from '../util/browserSniffing.js';
 import { applyVariables } from '../util/strings.js';
 /** @typedef {import('../util/strings.js').StringWithVars} StringWithVars */
+/** @typedef {import('../BookReader/PageContainer.js').PageContainer} PageContainer */
 
 const BookReader = /** @type {typeof import('../BookReader').default} */(window.BookReader);
 
@@ -11,6 +13,8 @@ export const DEFAULT_OPTIONS = {
   fullDjvuXmlUrl: null,
   /** @type {StringWithVars} The URL to fetch a single page of the DJVU xml. Supports options.vars. Also has {{pageIndex}} */
   singlePageDjvuXmlUrl: null,
+  /** Whether to fetch the XML as a jsonp */
+  jsonp: false,
 };
 /** @typedef {typeof DEFAULT_OPTIONS} TextSelectionPluginOptions */
 
@@ -46,7 +50,7 @@ export class TextSelectionPlugin {
     // Tspans are necessary on Chrome because they prevent newline character after every word when copying
     this.svgParagraphElement = "text";
     this.svgWordElement = "tspan";
-    this.insertNewlines = avoidTspans
+    this.insertNewlines = avoidTspans;
     // Safari has a bug where `pointer-events` doesn't work on `<tspans>`. So
     // there we will set `pointer-events: all` on the paragraph element. We don't
     // do this everywhere, because it's a worse experience. Thanks Safari :/
@@ -72,7 +76,8 @@ export class TextSelectionPlugin {
     this.djvuPagesPromise = $.ajax({
       type: "GET",
       url: applyVariables(this.options.fullDjvuXmlUrl, this.optionVariables),
-      dataType: "html",
+      dataType: this.options.jsonp ? "jsonp" : "html",
+      cache: true,
       error: (e) => undefined
     }).then((res) => {
       try {
@@ -94,21 +99,21 @@ export class TextSelectionPlugin {
       if (cachedEntry) {
         return cachedEntry.response;
       }
-      return $.ajax({
+      const res = await $.ajax({
         type: "GET",
         url: applyVariables(this.options.singlePageDjvuXmlUrl, this.optionVariables, { pageIndex: index }),
-        dataType: "html",
+        dataType: this.options.jsonp ? "jsonp" : "html",
+        cache: true,
         error: (e) => undefined,
-      }).then((res) => {
-        try {
-          const xmlDoc = $.parseXML(res);
-          const result = xmlDoc && $(xmlDoc).find("OBJECT")[0];
-          this.pageTextCache.add({ index, response: result });
-          return result;
-        } catch (e) {
-          return undefined;
-        }
       });
+      try {
+        const xmlDoc = $.parseXML(res);
+        const result = xmlDoc && $(xmlDoc).find("OBJECT")[0];
+        this.pageTextCache.add({ index, response: result });
+        return result;
+      } catch (e) {
+        return undefined;
+      }
     } else {
       const XMLpagesArr = await this.djvuPagesPromise;
       if (XMLpagesArr) return XMLpagesArr[index];
@@ -144,8 +149,8 @@ export class TextSelectionPlugin {
           this.textSelectingMode(svg);
         }
         else svg.classList.remove("selectingSVG");
-      })
-    })
+      });
+    });
   }
 
   /**
@@ -158,13 +163,13 @@ export class TextSelectionPlugin {
         if (window.getSelection().toString() != "") window.getSelection().removeAllRanges();
       }
       event.stopPropagation();
-    })
+    });
     $(svg).on('mouseup.textSelectPluginHandler', (event) => {
       event.stopPropagation();
       if (window.getSelection().toString() == "") {
         $(svg).off(".textSelectPluginHandler");
         this.defaultMode(svg);      }
-    })
+    });
   }
 
   /**
@@ -175,21 +180,20 @@ export class TextSelectionPlugin {
     /** @type {JQuery<SVGElement>} */
     const $svg = $container.find('svg.textSelectionSVG');
     if (!$svg.length) return;
-    $svg.each((i, s) => this.defaultMode(s))
+    $svg.each((i, s) => this.defaultMode(s));
     this.interceptCopy($container);
   }
 
   /**
-   * @param {number} pageIndex
-   * @param {JQuery} $container
+   * @param {PageContainer} pageContainer
    */
-  async createTextLayer(pageIndex, $container) {
+  async createTextLayer(pageContainer) {
+    const pageIndex = pageContainer.page.index;
+    const $container = pageContainer.$container;
     const $svgLayers = $container.find('.textSelectionSVG');
     if ($svgLayers.length) return;
     const XMLpage = await this.getPageText(pageIndex);
     if (!XMLpage) return;
-    const XMLwidth = $(XMLpage).attr("width");
-    const XMLheight = $(XMLpage).attr("height");
 
     const totalWords = $(XMLpage).find("WORD").length;
     if (totalWords > this.maxWordRendered) {
@@ -197,19 +201,8 @@ export class TextSelectionPlugin {
       return;
     }
 
-    const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-    svg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
-    svg.setAttribute("viewBox", `0 0 ${XMLwidth} ${XMLheight}`);
+    const svg = createSVGPageLayer(pageContainer.page, 'textSelectionSVG');
     $container.append(svg);
-    svg.setAttribute('class', 'textSelectionSVG');
-    svg.setAttribute('preserveAspectRatio', 'none');
-    $(svg).css({
-      "width": "100%",
-      "position": "absolute",
-      "height": "100%",
-      "top": "0",
-      "left": "0",
-    });
 
     $(XMLpage).find("PARAGRAPH").each((i, paragraph) => {
       // Adding text element for each paragraph in the page
@@ -266,7 +259,7 @@ export class TextSelectionPlugin {
       const paragWordHeight = wordHeightArr[Math.floor(wordHeightArr.length * 0.85)];
       paragSvg.setAttribute("font-size", paragWordHeight.toString());
       svg.appendChild(paragSvg);
-    })
+    });
     this.stopPageFlip($container);
   }
 }
@@ -290,11 +283,9 @@ export class BookreaderWithTextSelection extends BookReader {
   _createPageContainer(index) {
     const pageContainer = super._createPageContainer(index);
     // Disable if thumb mode; it's too janky
-    // index can be -1 for "pre-cover" region
-    // Added checking of lastPageIndex to avoid loop around index value
-    const lastPageIndex = this.getNumLeafs() - 1;
-    if (this.mode !== this.constModeThumb && (index >= 0 && index <= lastPageIndex)) {
-      this.textSelectionPlugin?.createTextLayer(index, pageContainer.$container);
+    // .page can be null for "pre-cover" region
+    if (this.mode !== this.constModeThumb && pageContainer.page) {
+      this.textSelectionPlugin?.createTextLayer(pageContainer);
     }
     return pageContainer;
   }

package/src/plugins/plugin.vendor-fullscreen.js

@@ -56,7 +56,7 @@ if (!isMobile()) {
           $(document.body).append(cboxOverlay).append(cbox);
         }
       });
-    }
+    };
   })(BookReader.prototype.init);
 
   /**
@@ -92,7 +92,7 @@ if (!isMobile()) {
     $(document).off('keyup' + EVENT_NAMESPACE);
 
     this.isFullscreenActive = false;
-    this.updateBrClasses()
+    this.updateBrClasses();
 
     this.resize();
     this.refs.$brContainer.animate({ opacity: 1 }, 400, 'linear');
@@ -233,8 +233,8 @@ export function bindFullscreenChangeListener(
     'moz',
     'ms'
   ];
-  const all_events = $.trim(event + vendor_prefixes.join(event) + event);
-  $(document).bind(all_events, data, fullscreenchangeListener);
+  const all_events = (event + vendor_prefixes.join(event) + event).trim();
+  $(document).on(all_events, data, fullscreenchangeListener);
 }
 
 /**