@internetarchive/bookreader 5.0.0-34 → 5.0.0-37

package/src/BookNavigator/visual-adjustments/visual-adjustments.js

@@ -1,6 +1,6 @@
-import { css, html, LitElement } from "lit-element";
-import { repeat } from "lit-html/directives/repeat.js";
-import { nothing } from "lit-html";
+import { css, html, LitElement } from "lit";
+import { repeat } from "lit/directives/repeat.js";
+import { nothing } from "lit";
 import checkmarkIcon from '../assets/icon_checkmark.js';
 import "@internetarchive/icon-magnify-minus/icon-magnify-minus";
 import "@internetarchive/icon-magnify-plus/icon-magnify-plus";

package/src/BookNavigator/volumes/volumes-provider.js

@@ -1,4 +1,4 @@
-import { html } from 'lit-element';
+import { html } from 'lit';
 
 import sortDescIcon from '../assets/icon_sort_desc.js';
 import sortAscIcon from '../assets/icon_sort_asc.js';

package/src/BookNavigator/volumes/volumes.js

@@ -1,6 +1,5 @@
-import { css, html, LitElement } from 'lit-element';
-import { nothing } from 'lit-html';
-import { repeat } from 'lit-html/directives/repeat';
+import { css, html, LitElement, nothing } from 'lit';
+import { repeat } from 'lit/directives/repeat.js';
 
 export class Volumes extends LitElement {
   static get properties() {

package/src/BookReader/Mode1Up.js

@@ -46,7 +46,8 @@ export class Mode1Up {
       if (!this.everShown) {
         this.mode1UpLit.initFirstRender(startLeaf);
         this.everShown = true;
-        await this.mode1UpLit.requestUpdate();
+        this.mode1UpLit.requestUpdate();
+        await this.mode1UpLit.updateComplete;
         new DragScrollable(this.mode1UpLit, {
           preventDefault: true,
           dragSelector: '.br-mode-1up__visible-world',

package/src/BookReader/Mode1UpLit.js

@@ -1,6 +1,7 @@
 // @ts-check
-import { customElement, html, LitElement, property, query } from 'lit-element';
-import { styleMap } from 'lit-html/directives/style-map';
+import { customElement, property, query } from 'lit/decorators.js';
+import {LitElement, html} from 'lit';
+import { styleMap } from 'lit/directives/style-map.js';
 import { ModeSmoothZoom } from './ModeSmoothZoom';
 import { arrChanged, calcScreenDPI, genToArray, sum, throttle } from './utils';
 import { HTMLDimensionsCacher } from "./utils/HTMLDimensionsCacher";

package/src/BookReader/Toolbar/Toolbar.js

@@ -335,7 +335,7 @@ export function blankInfoDiv() {
   return $(`
     <div class="BRfloat BRinfo">
       <div class="BRfloatHead">About this book
-        <button class="floatShut" href="javascript:;" onclick="$.fn.colorbox.close();"><span class="shift">Close</span></button>
+        <button class="floatShut" href="javascript:;" onclick="$.fn.colorbox.close();"><span class="br-colorbox-shift">Close</span></button>
       </div>
       <div class="BRfloatBody">
         <div class="BRfloatCover"></div>
@@ -356,7 +356,7 @@ export function blankShareDiv() {
     <div class="BRfloat BRshare">
       <div class="BRfloatHead">
         Share
-        <button class="floatShut" href="javascript:;" onclick="$.fn.colorbox.close();"><span class="shift">Close</span></button>
+        <button class="floatShut" href="javascript:;" onclick="$.fn.colorbox.close();"><span class="br-colorbox-shift">Close</span></button>
       </div>
     </div>`);
 }

package/src/BookReader.js

@@ -333,9 +333,9 @@ BookReader.util = utils;
  * @private
  */
 BookReader.prototype.extendParams = function(params, newParams) {
-  var modifiedNewParams = $.extend({}, newParams);
+  const modifiedNewParams = $.extend({}, newParams);
   if ('undefined' != typeof(modifiedNewParams.page)) {
-    var pageIndex = this._models.book.parsePageString(modifiedNewParams.page);
+    const pageIndex = this._models.book.parsePageString(modifiedNewParams.page);
     if (!isNaN(pageIndex))
       modifiedNewParams.index = pageIndex;
     delete modifiedNewParams.page;
@@ -349,7 +349,7 @@ BookReader.prototype.extendParams = function(params, newParams) {
  * @return {object} the parsed params
  */
 BookReader.prototype.initParams = function() {
-  var params = {};
+  const params = {};
   // Flag initializing for updateFromParams()
   params.init = true;
 
@@ -398,7 +398,7 @@ BookReader.prototype.initParams = function() {
   // Check for URL plugin
   if (this.options.enableUrlPlugin) {
     // Params explicitly set in URL take precedence over all other methods
-    var urlParams = this.paramsFromFragment(this.urlReadFragment());
+    let urlParams = this.paramsFromFragment(this.urlReadFragment());
 
     // Get params if hash fragment available with 'history' urlMode
     const hasHashURL = !Object.keys(urlParams).length && this.urlReadHashFragment();
@@ -481,8 +481,8 @@ BookReader.prototype.readQueryString = function() {
  */
 BookReader.prototype.getInitialMode = function(params) {
   // Use params or browser width to set view mode
-  var windowWidth = $(window).width();
-  var nextMode;
+  const windowWidth = $(window).width();
+  let nextMode;
   if ('undefined' != typeof(params.mode)) {
     nextMode = params.mode;
   } else if (this.ui == 'full'
@@ -509,7 +509,7 @@ BookReader.prototype.init = function() {
   this.init.initComplete = false;
   this.pageScale = this.reduce; // preserve current reduce
 
-  var params = this.initParams();
+  const params = this.initParams();
 
   this.firstIndex = params.index ? params.index : 0;
 
@@ -653,8 +653,8 @@ BookReader.prototype.resize = function() {
     } else {
       // used when zoomed in
       // Re-center if the scrollbars have disappeared
-      var center = this.twoPageGetViewCenter();
-      var doRecenter = false;
+      const center = this.twoPageGetViewCenter();
+      let doRecenter = false;
       if (this.twoPage.totalWidth < this.refs.$brContainer.prop('clientWidth')) {
         center.percentageX = 0.5;
         doRecenter = true;
@@ -816,8 +816,8 @@ BookReader.prototype.bindGestures = function(jElement) {
   // when you move the book with one finger and then add another
   // finger to pinch. Gestures are aware of scroll state.
 
-  var self = this;
-  var numTouches = 1;
+  const self = this;
+  let numTouches = 1;
 
   jElement.unbind('touchmove').bind('touchmove', function(e) {
     if (e.originalEvent.cancelable) numTouches = e.originalEvent.touches.length;
@@ -901,8 +901,8 @@ BookReader.prototype.resizeBRcontainer = function(animate) {
 };
 
 BookReader.prototype.centerPageView = function() {
-  var scrollWidth  = this.refs.$brContainer.prop('scrollWidth');
-  var clientWidth  =  this.refs.$brContainer.prop('clientWidth');
+  const scrollWidth  = this.refs.$brContainer.prop('scrollWidth');
+  const clientWidth  =  this.refs.$brContainer.prop('clientWidth');
   if (scrollWidth > clientWidth) {
     this.refs.$brContainer.prop('scrollLeft', (scrollWidth - clientWidth) / 2);
   }
@@ -990,7 +990,7 @@ BookReader.prototype._reduceSort = (a, b) => a.reduce - b.reduce;
  * @return {boolean} Returns true if page could be found, false otherwise.
  */
 BookReader.prototype.jumpToPage = function(pageNum) {
-  var pageIndex = this._models.book.parsePageString(pageNum);
+  const pageIndex = this._models.book.parsePageString(pageNum);
 
   if ('undefined' != typeof(pageIndex)) {
     this.jumpToIndex(pageIndex);
@@ -1119,14 +1119,14 @@ BookReader.prototype.switchMode = function(
   if (!(this.suppressFragmentChange || suppressFragmentChange)) {
     this.trigger(BookReader.eventNames.fragmentChange);
   }
-  var eventName = mode + 'PageViewSelected';
+  const eventName = mode + 'PageViewSelected';
   this.trigger(BookReader.eventNames[eventName]);
 
   this.textSelectionPlugin?.stopPageFlip(this.refs.$brContainer);
 };
 
 BookReader.prototype.updateBrClasses = function() {
-  var modeToClass = {};
+  const modeToClass = {};
   modeToClass[this.constMode1up] = 'BRmode1up';
   modeToClass[this.constMode2up] = 'BRmode2Up';
   modeToClass[this.constModeThumb] = 'BRmodeThumb';
@@ -1192,7 +1192,8 @@ BookReader.prototype.enterFullscreen = async function(bindKeyboardControls = tru
   if (this.activeMode instanceof Mode1Up) {
     this.activeMode.mode1UpLit.scale = this.activeMode.mode1UpLit.computeDefaultScale(this._models.book.getPage(currentIndex));
     // Need the new scale to be applied before calling jumpToIndex
-    await this.activeMode.mode1UpLit.requestUpdate();
+    this.activeMode.mode1UpLit.requestUpdate();
+    await this.activeMode.mode1UpLit.updateComplete;
   }
   this.jumpToIndex(currentIndex);
   this.animating = false;
@@ -1222,7 +1223,7 @@ BookReader.prototype.exitFullScreen = async function () {
 
   $(document).off('keyup', this._fullscreenCloseHandler);
 
-  var windowWidth = $(window).width();
+  const windowWidth = $(window).width();
 
   const canShow2up = this.options.controls.twoPage.visible;
   if (canShow2up && (windowWidth <= this.onePageMinBreakpoint)) {
@@ -1241,7 +1242,8 @@ BookReader.prototype.exitFullScreen = async function () {
 
   if (this.activeMode instanceof Mode1Up) {
     this.activeMode.mode1UpLit.scale = this.activeMode.mode1UpLit.computeDefaultScale(this._models.book.getPage(this.currentIndex()));
-    await this.activeMode.mode1UpLit.requestUpdate();
+    this.activeMode.mode1UpLit.requestUpdate();
+    await this.activeMode.mode1UpLit.updateComplete;
   }
 
   this.animating = false;
@@ -1706,7 +1708,7 @@ BookReader.prototype.bindNavigationHandlers = function() {
     },
     full: () => {
       if (this.ui == 'embed') {
-        var url = this.$('.BRembedreturn a').attr('href');
+        const url = this.$('.BRembedreturn a').attr('href');
         window.open(url);
       } else {
         this.toggleFullscreen();
@@ -1725,12 +1727,12 @@ BookReader.prototype.bindNavigationHandlers = function() {
     });
   }
 
-  var $brNavCntlBtmEl = this.$('.BRnavCntlBtm');
-  var $brNavCntlTopEl = this.$('.BRnavCntlTop');
+  const $brNavCntlBtmEl = this.$('.BRnavCntlBtm');
+  const $brNavCntlTopEl = this.$('.BRnavCntlTop');
 
   this.$('.BRnavCntl').click(
     function() {
-      var promises = [];
+      const promises = [];
       // TODO don't use magic constants
       // TODO move this to a function
       if ($brNavCntlBtmEl.hasClass('BRdn')) {
@@ -1827,7 +1829,7 @@ BookReader.prototype.navigationMousemoveHandler = function(event) {
   if (event.data['br'].uiAutoHide) {
     // 77px is an approximate height of the Internet Archive Top Nav
     // 75 & 76 (pixels) provide used in this context is checked against the IA top nav height
-    var navkey = $(document).height() - 75;
+    const navkey = $(document).height() - 75;
     if ((event.pageY < 76) || (event.pageY > navkey)) {
       // inside or near navigation elements
       event.data['br'].hideNavigation();
@@ -1858,7 +1860,7 @@ BookReader.prototype.initSwipeData = function(clientX, clientY) {
 };
 
 BookReader.prototype.swipeMousedownHandler = function(event) {
-  var self = event.data['br'];
+  const self = event.data['br'];
 
   // We should be the last bubble point for the page images
   // Disable image drag and select, but keep right-click
@@ -1888,8 +1890,8 @@ BookReader.prototype.swipeMousedownHandler = function(event) {
 };
 
 BookReader.prototype.swipeMousemoveHandler = function(event) {
-  var self = event.data['br'];
-  var _swipe = self._swipe;
+  const self = event.data['br'];
+  const _swipe = self._swipe;
   if (! _swipe.mightBeSwiping) {
     return;
   }
@@ -1899,12 +1901,12 @@ BookReader.prototype.swipeMousemoveHandler = function(event) {
   _swipe.deltaY = event.clientY - _swipe.startY;
   _swipe.deltaT = (new Date).getTime() - _swipe.startTime;
 
-  var absX = Math.abs(_swipe.deltaX);
-  var absY = Math.abs(_swipe.deltaY);
+  const absX = Math.abs(_swipe.deltaX);
+  const absY = Math.abs(_swipe.deltaY);
 
   // Minimum distance in the amount of tim to trigger the swipe
-  var minSwipeLength = Math.min(self.refs.$br.width() / 5, 80);
-  var maxSwipeTime = 400;
+  const minSwipeLength = Math.min(self.refs.$br.width() / 5, 80);
+  const maxSwipeTime = 400;
 
   // Check for horizontal swipe
   if (absX > absY && (absX > minSwipeLength) && _swipe.deltaT < maxSwipeTime) {
@@ -1938,7 +1940,7 @@ BookReader.prototype.swipeMousemoveHandler = function(event) {
 };
 
 BookReader.prototype.swipeMouseupHandler = function(event) {
-  var _swipe = event.data['br']._swipe;
+  const _swipe = event.data['br']._swipe;
   _swipe.mightBeSwiping = false;
   _swipe.mightBeDragging = false;
 
@@ -1955,7 +1957,7 @@ BookReader.prototype.swipeMouseupHandler = function(event) {
 };
 
 BookReader.prototype.bindMozTouchHandlers = function() {
-  var self = this;
+  const self = this;
 
   // Currently only want touch handlers in 2up
   this.refs.$br
@@ -1982,8 +1984,8 @@ BookReader.prototype.bindMozTouchHandlers = function() {
  */
 BookReader.prototype.navigationIsVisible = function() {
   // $$$ doesn't account for transitioning states, nav must be fully visible to return true
-  var toolpos = this.refs.$BRtoolbar.position();
-  var tooltop = toolpos.top;
+  const toolpos = this.refs.$BRtoolbar.position();
+  const tooltop = toolpos.top;
   return tooltop == 0;
 };
 
@@ -1992,19 +1994,19 @@ BookReader.prototype.navigationIsVisible = function() {
  * Defaults to SHOW the navigation chrome
  */
 BookReader.prototype.setNavigationView = function brSetNavigationView(hide) {
-  var animationLength = this.constNavAnimationDuration;
-  var animationType = 'linear';
-  var resizePageContainer = function resizePageContainer () {
+  const animationLength = this.constNavAnimationDuration;
+  const animationType = 'linear';
+  const resizePageContainer = function resizePageContainer () {
     /* main page container fills whole container */
     if (this.constMode2up !== this.mode) {
-      var animate = true;
+      const animate = true;
       this.resizeBRcontainer(animate);
     }
     this.trigger(BookReader.eventNames.navToggled);
   }.bind(this);
 
-  var toolbarHeight = 0;
-  var navbarHeight = 0;
+  let toolbarHeight = 0;
+  let navbarHeight = 0;
   if (hide) {
     toolbarHeight = this.getToolBarHeight() * -1;
     navbarHeight = this.getFooterHeight() * -1;
@@ -2035,7 +2037,7 @@ BookReader.prototype.setNavigationView = function brSetNavigationView(hide) {
 BookReader.prototype.hideNavigation = function() {
   // Check if navigation is showing
   if (this.navigationIsVisible()) {
-    var hide = true;
+    const hide = true;
     this.setNavigationView(hide);
   }
 };
@@ -2086,7 +2088,7 @@ BookReader.prototype.firstDisplayableIndex = function() {
  */
 BookReader.prototype.lastDisplayableIndex = function() {
 
-  var lastIndex = this._models.book.getNumLeafs() - 1;
+  const lastIndex = this._models.book.getNumLeafs() - 1;
 
   if (this.mode != this.constMode2up) {
     return lastIndex;
@@ -2325,7 +2327,7 @@ BookReader.prototype.initUIStrings = function() {
   // the toolbar and nav bar easier
 
   // Setup tooltips -- later we could load these from a file for i18n
-  var titles = {
+  const titles = {
     '.logo': 'Go to Archive.org', // $$$ update after getting OL record
     '.zoom_in': 'Zoom in',
     '.zoom_out': 'Zoom out',
@@ -2357,7 +2359,7 @@ BookReader.prototype.initUIStrings = function() {
     titles['.book_rightmost'] = 'First page';
   }
 
-  for (var icon in titles) {
+  for (const icon in titles) {
     this.$(icon).prop('title', titles[icon]);
   }
 };
@@ -2368,7 +2370,7 @@ BookReader.prototype.initUIStrings = function() {
 BookReader.prototype.reloadImages = function() {
   this.refs.$brContainer.find('img').each(function(index, elem) {
     if (!elem.complete || elem.naturalHeight === 0) {
-      var src = elem.src;
+      const src = elem.src;
       elem.src = '';
       setTimeout(function() {
         elem.src = src;
@@ -2382,10 +2384,10 @@ BookReader.prototype.reloadImages = function() {
  * @return {number}
  */
 BookReader.prototype.getFooterHeight = function() {
-  var $heightEl = this.mode == this.constMode2up ? this.refs.$BRfooter : this.refs.$BRnav;
+  const $heightEl = this.mode == this.constMode2up ? this.refs.$BRfooter : this.refs.$BRnav;
   if ($heightEl && this.refs.$BRfooter) {
-    var outerHeight = $heightEl.outerHeight();
-    var bottom = parseInt(this.refs.$BRfooter.css('bottom'));
+    const outerHeight = $heightEl.outerHeight();
+    const bottom = parseInt(this.refs.$BRfooter.css('bottom'));
     if (!isNaN(outerHeight) && !isNaN(bottom)) {
       return outerHeight + bottom;
     }
@@ -2401,11 +2403,11 @@ BookReader.prototype.getFooterHeight = function() {
  * @return {Object}
  */
 BookReader.prototype.paramsFromCurrent = function() {
-  var params = {};
+  const params = {};
 
   // Path params
-  var index = this.currentIndex();
-  var pageNum = this._models.book.getPageNum(index);
+  const index = this.currentIndex();
+  const pageNum = this._models.book.getPageNum(index);
   if ((pageNum === 0) || pageNum) {
     params.page = pageNum;
   }
@@ -2444,7 +2446,7 @@ BookReader.prototype.paramsFromCurrent = function() {
  * @return {Object}
  */
 BookReader.prototype.paramsFromFragment = function(fragment) {
-  var params = {};
+  const params = {};
 
   // For backwards compatibility we allow an initial # character
   // (as from window.location.hash) but don't require it
@@ -2453,7 +2455,7 @@ BookReader.prototype.paramsFromFragment = function(fragment) {
   }
 
   // Simple #nn syntax
-  var oldStyleLeafNum = parseInt( /^\d+$/.exec(fragment) );
+  const oldStyleLeafNum = parseInt( /^\d+$/.exec(fragment) );
   if ( !isNaN(oldStyleLeafNum) ) {
     params.index = oldStyleLeafNum;
 
@@ -2462,9 +2464,9 @@ BookReader.prototype.paramsFromFragment = function(fragment) {
   }
 
   // Split into key-value pairs
-  var urlArray = fragment.split('/');
-  var urlHash = {};
-  for (var i = 0; i < urlArray.length; i += 2) {
+  const urlArray = fragment.split('/');
+  const urlHash = {};
+  for (let i = 0; i < urlArray.length; i += 2) {
     urlHash[urlArray[i]] = urlArray[i + 1];
   }
 

package/src/css/_colorbox.scss

@@ -46,7 +46,7 @@
         }
         #cboxLoadingOverlay{background:transparent;}
 
-.shift{
+.br-colorbox-shift {
     position: absolute !important;
     left: -10000px !important;
-}
+}

package/src/ia-bookreader/ia-bookreader.js

@@ -2,7 +2,7 @@
  * BookReaderTemplate to load BookNavigator components
  */
 
-import { LitElement, html, css } from 'lit-element';
+import { LitElement, html, css } from 'lit';
 
 import '@internetarchive/ia-item-navigator';
 import '../BookNavigator/book-navigator.js';
@@ -40,6 +40,7 @@ export class IaBookReader extends LitElement {
     this.loaded = false;
     this.menuShortcuts = [];
     this.menuContents = [];
+    this.openMenuName = '';
   }
 
   updated() {
@@ -98,10 +99,11 @@ export class IaBookReader extends LitElement {
       return;
     }
 
+    this.openMenuName = menuId;
+
     if (action === 'open') {
       this.itemNav?.openShortcut(menuId);
     } else if (action === 'toggle') {
-      this.itemNav?.openMenu(menuId);
       this.itemNav?.toggleMenu();
     }
   }
@@ -119,6 +121,7 @@ export class IaBookReader extends LitElement {
           ?signedIn=${this.signedIn}
           .menuShortcuts=${this.menuShortcuts}
           .menuContents=${this.menuContents}
+          .openMenu=${this.openMenuName}
         >
           <div slot="header">
             <slot name="header"></slot>

package/src/plugins/plugin.chapters.js

@@ -174,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}`;
@@ -190,20 +190,16 @@ 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

package/src/plugins/plugin.text_selection.js

@@ -96,21 +96,20 @@ 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",
         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];

package/src/plugins/search/plugin.search.js

@@ -132,7 +132,7 @@ BookReader.prototype._createPageContainer = (function (super_) {
  * @param {string} term
  * @param {SearchOptions} overrides
  */
-BookReader.prototype.search = function(term = '', overrides = {}) {
+BookReader.prototype.search = async function(term = '', overrides = {}) {
   /** @type {SearchOptions} */
   const defaultOptions = {
     goToFirstResult: false, /* jump to the first result (default=false) */
@@ -210,13 +210,13 @@ BookReader.prototype.search = function(term = '', overrides = {}) {
   };
 
   this.trigger('SearchStarted', { term: this.searchTerm, instance: this });
-  return $.ajax({
+  return processSearchResults(await $.ajax({
     url: url,
     dataType: 'jsonp',
     cache: true,
     beforeSend,
     jsonpCallback: 'BRSearchInProgress'
-  }).then(processSearchResults);
+  }));
 };
 
 /**

package/src/plugins/tts/AbstractTTSEngine.js

@@ -125,13 +125,13 @@ export default class AbstractTTSEngine {
   }
 
   /** @public */
-  jumpBackward() {
-    Promise.all([
+  async jumpBackward() {
+    await Promise.all([
       this.activeSound.stop(),
       this._chunkIterator.decrement()
         .then(() => this._chunkIterator.decrement())
-    ])
-      .then(() => this.step());
+    ]);
+    this.step();
   }
 
   /** @param {number} newRate */
@@ -147,36 +147,33 @@ export default class AbstractTTSEngine {
   }
 
   /** @private */
-  step() {
-    this._chunkIterator.next()
-      .then(chunk => {
-        if (chunk == PageChunkIterator.AT_END) {
-          this.stop();
-          this.opts.onDone();
-          return;
-        }
-
-        this.opts.onLoadingStart();
-        const sound = this.createSound(chunk);
-        sound.chunk = chunk;
-        sound.rate = this.playbackRate;
-        sound.voice = this.voice;
-        sound.load(() => this.opts.onLoadingComplete());
-
-        this.opts.onLoadingComplete();
-        return this.opts.beforeChunkPlay(chunk).then(() => sound);
-      })
-      .then(sound => {
-        if (!this.playing) return;
-
-        const playPromise = this.playSound(sound)
-          .then(() => this.opts.afterChunkPlay(sound.chunk));
-        if (this.paused) this.pause();
-        return playPromise;
-      })
-      .then(() => {
-        if (this.playing) return this.step();
-      });
+  async step() {
+    const chunk = await  this._chunkIterator.next();
+    if (chunk == PageChunkIterator.AT_END) {
+      this.stop();
+      this.opts.onDone();
+      return;
+    }
+    this.opts.onLoadingStart();
+    const sound = this.createSound(chunk);
+    sound.chunk = chunk;
+    sound.rate = this.playbackRate;
+    sound.voice = this.voice;
+    sound.load(() => this.opts.onLoadingComplete());
+
+    this.opts.onLoadingComplete();
+
+    await this.opts.beforeChunkPlay(chunk);
+
+    if (!this.playing) return;
+
+    const playPromise = await this.playSound(sound)
+      .then(()=> this.opts.afterChunkPlay(sound.chunk));
+
+    if (this.paused) this.pause();
+    await playPromise;
+
+    if (this.playing) return this.step();
   }
 
   /**