@internetarchive/bookreader 5.0.0-92 → 5.0.0-94

package/src/plugins/plugin.text_selection.js

@@ -38,6 +38,8 @@ export class TextSelectionPlugin extends BookReaderPlugin {
     singlePageDjvuXmlUrl: null,
     /** Whether to fetch the XML as a jsonp */
     jsonp: false,
+    /** Mox words tha can be selected when the text layer is protected */
+    maxProtectedWords: 200,
   }
 
   /**@type {PromiseLike<JQuery<HTMLElement>|undefined>} */
@@ -75,7 +77,7 @@ export class TextSelectionPlugin extends BookReaderPlugin {
     new SelectionObserver('.BRtextLayer', (selectEvent) => {
       // Track how often selection is used
       if (selectEvent == 'started') {
-        this.br._plugins.archiveAnalytics?.sendEvent('BookReader', 'SelectStart');
+        this.br.plugins.archiveAnalytics?.sendEvent('BookReader', 'SelectStart');
 
         // Set a class on the page to avoid hiding it when zooming/etc
         this.br.refs.$br.find('.BRpagecontainer--hasSelection').removeClass('BRpagecontainer--hasSelection');
@@ -84,6 +86,7 @@ export class TextSelectionPlugin extends BookReaderPlugin {
     }).attach();
 
     if (this.br.protected) {
+      document.addEventListener('selectionchange', this._limitSelection);
       // Prevent right clicking when selected text
       $(document.body).on('contextmenu dragstart copy', (e) => {
         const selection = document.getSelection();
@@ -100,6 +103,41 @@ export class TextSelectionPlugin extends BookReaderPlugin {
     }
   }
 
+  _limitSelection = () => {
+    const selection = window.getSelection();
+    if (!selection.rangeCount) return;
+
+    const range = selection.getRangeAt(0);
+
+    // Check if range.startContainer is inside the sub-tree of .BRContainer
+    const startInBr = !!range.startContainer.parentElement.closest('.BRcontainer');
+    const endInBr = !!range.endContainer.parentElement.closest('.BRcontainer');
+    if (!startInBr && !endInBr) return;
+    if (!startInBr || !endInBr) {
+      // weird case, just clear the selection
+      selection.removeAllRanges();
+      return;
+    }
+
+    // Find the last allowed word in the selection
+    const lastAllowedWord = genAt(
+      genFilter(
+        walkBetweenNodes(range.startContainer, range.endContainer),
+        (node) => node.classList?.contains('BRwordElement'),
+      ),
+      this.options.maxProtectedWords - 1,
+    );
+
+    if (!lastAllowedWord || range.endContainer.parentNode == lastAllowedWord) return;
+
+    const newRange = document.createRange();
+    newRange.setStart(range.startContainer, range.startOffset);
+    newRange.setEnd(lastAllowedWord.firstChild, lastAllowedWord.textContent.length);
+
+    selection.removeAllRanges();
+    selection.addRange(newRange);
+  };
+
   /**
    * @override
    * @param {PageContainer} pageContainer
@@ -511,6 +549,33 @@ function augmentLine(line) {
   };
 }
 
+/**
+ * @template T
+ * Get the i-th element of an iterable
+ * @param {Iterable<T>} iterable
+ * @param {number} index
+ */
+export function genAt(iterable, index) {
+  let i = 0;
+  for (const x of iterable) {
+    if (i == index) return x;
+    i++;
+  }
+  return undefined;
+}
+
+/**
+ * @template T
+ * Generator version of filter
+ * @param {Iterable<T>} iterable
+ * @param {function(T): boolean} fn
+ */
+export function* genFilter(iterable, fn) {
+  for (const x of iterable) {
+    if (fn(x)) yield x;
+  }
+}
+
 /**
  * @template TFrom, TTo
  * Generator version of map
@@ -647,3 +712,49 @@ class Rect {
   get top() { return this.y; }
   get left() { return this.x; }
 }
+
+/**
+ * Depth traverse the DOM tree starting at `start`, and ending at `end`.
+ * @param {Node} start
+ * @param {Node} end
+ * @returns {Generator<Node>}
+ */
+export function* walkBetweenNodes(start, end) {
+  let done = false;
+
+  /**
+   * @param {Node} node
+   */
+  function* walk(node, {children = true, parents = true, siblings = true} = {}) {
+    if (node === end) {
+      done = true;
+      yield node;
+      return;
+    }
+
+    // yield self
+    yield node;
+
+    // First iterate children (depth-first traversal)
+    if (children && node.firstChild) {
+      yield* walk(node.firstChild, {children: true, parents: false, siblings: true});
+      if (done) return;
+    }
+
+    // Then iterate siblings
+    if (siblings) {
+      for (let sib = node.nextSibling; sib; sib = sib.nextSibling) {
+        yield* walk(sib, {children: true, parents: false, siblings: false});
+        if (done) return;
+      }
+    }
+
+    // Finally, move up the tree
+    if (parents && node.parentNode) {
+      yield* walk(node.parentNode, {children: false, parents: true, siblings: true});
+      if (done) return;
+    }
+  }
+
+  yield* walk(start);
+}

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

@@ -341,8 +341,8 @@ export class SearchPlugin extends BookReaderPlugin {
     let makeUnviewableAtEnd = false;
     if (!page.isViewable) {
       const resp = await fetch('/services/bookreader/request_page?' + new URLSearchParams({
-        id: this.options.bookId,
-        subprefix: this.options.subPrefix,
+        id: this.br.options.bookId,
+        subprefix: this.br.options.subPrefix,
         leafNum: page.leafNum,
       })).then(r => r.json());
 

package/src/plugins/search/view.js

@@ -44,7 +44,7 @@ class SearchView {
   }
 
   clearSearchFieldAndResults(dispatchEventWhenComplete = true) {
-    this.br._plugins.search.removeSearchResults();
+    this.br.plugins.search.removeSearchResults();
     this.removeResultPins();
     this.emptyMatches();
     this.setQuery('');
@@ -218,7 +218,7 @@ class SearchView {
       <form class="BRbooksearch desktop">
         <input type="search" name="query" class="BRsearchInput" value="" placeholder="Search inside"/>
         <button type="submit" class="BRsearchSubmit">
-          <img src="${this.br.imagesBaseURL}icon_search_button.svg" />
+          <img src="${this.br.options.imagesBaseURL}icon_search_button.svg" />
         </button>
       </form>
     `;
@@ -273,7 +273,7 @@ class SearchView {
           $(event.target).addClass('front');
         })
         .on("mouseleave", (event) => $(event.target).removeClass('front'))
-        .on("click", () => { this.br._plugins.search.jumpToMatch(match.matchIndex); });
+        .on("click", () => { this.br.plugins.search.jumpToMatch(match.matchIndex); });
     });
   }
 
@@ -379,11 +379,11 @@ class SearchView {
 
   handleSearchStarted() {
     this.emptyMatches();
-    this.br._plugins.search.removeSearchHilites();
+    this.br.plugins.search.removeSearchHilites();
     this.removeResultPins();
     this.toggleSearchPending(true);
     this.teardownSearchNavigation();
-    this.setQuery(this.br._plugins.search.searchTerm);
+    this.setQuery(this.br.plugins.search.searchTerm);
   }
 
   /**

package/src/plugins/tts/plugin.tts.js

@@ -199,7 +199,7 @@ export class TtsPlugin extends BookReaderPlugin {
   }
 
   toggle() {
-    this.br._plugins.autoplay?.stop();
+    this.br.plugins.autoplay?.stop();
     if (this.ttsEngine.playing) {
       this.stop();
     } else {
@@ -338,11 +338,11 @@ export class TtsPlugin extends BookReaderPlugin {
    * @param {number} [value]
    */
   sendAnalyticsEvent(action, value) {
-    if (this.br._plugins.archiveAnalytics) {
+    if (this.br.plugins.archiveAnalytics) {
       const extraValues = {};
       const mediaLanguage = this.ttsEngine.opts.bookLanguage;
       if (mediaLanguage) extraValues.mediaLanguage = mediaLanguage;
-      this.br._plugins.archiveAnalytics.sendEvent('BRReadAloud', action, value, extraValues);
+      this.br.plugins.archiveAnalytics.sendEvent('BRReadAloud', action, value, extraValues);
     }
   }
 }

package/src/plugins/url/plugin.url.js

@@ -1,6 +1,6 @@
 /* global BookReader */
 
-import { UrlPlugin } from "./UrlPlugin";
+import { UrlPlugin } from "./UrlPlugin.js";
 
 /**
  * Plugin for URL management in BookReader
@@ -106,7 +106,7 @@ BookReader.prototype.urlStartLocationPolling = function() {
     this.trigger(BookReader.eventNames.stop);
     if (this.animating) {
       // Queue change if animating
-      this._plugins.autoplay?.stop();
+      this.plugins.autoplay?.stop();
       this.animationFinishedCallback = updateParams;
     } else {
       // update immediately

package/tests/e2e/autoplay.test.js

@@ -1,5 +1,5 @@
 import { ClientFunction } from 'testcafe';
-import params from './helpers/params';
+import params from './helpers/params.js';
 
 const getLocationHref = ClientFunction(() => window.location.href.toString());
 const FLIP_SPEED = 200;

package/tests/e2e/base.test.js

@@ -1,7 +1,7 @@
-import { runBaseTests } from './helpers/base';
-import BookReader from './models/BookReader';
-import { runSearchTests } from './helpers/search';
-import params from './helpers/params';
+import { runBaseTests } from './helpers/base.js';
+import BookReader from './models/BookReader.js';
+import { runSearchTests } from './helpers/search.js';
+import params from './helpers/params.js';
 
 const ocaids = params.ocaids || [
   'theworksofplato01platiala',

package/tests/e2e/helpers/base.js

@@ -78,8 +78,8 @@ export function runBaseTests (br) {
 
     // Check if uses plugin.resume.js
     const usesResume = ClientFunction(() => {
-      const hasResumePlugin = typeof(br._plugins.resume) !== "undefined";
-      const hasResumeValue = hasResumePlugin ? br._plugins.resume.getResumeValue() : false;
+      const hasResumePlugin = typeof(br.plugins.resume) !== "undefined";
+      const hasResumeValue = hasResumePlugin ? br.plugins.resume.getResumeValue() : false;
       return hasResumeValue;
     });
 

package/tests/e2e/models/BookReader.js

@@ -1,5 +1,5 @@
 import { Selector } from 'testcafe';
-import Nav from './Navigation';
+import Nav from './Navigation.js';
 
 /** Model defining BookReader base elements */
 export default class BookReader {

package/tests/e2e/rightToLeft.test.js

@@ -1,8 +1,8 @@
-import { runBaseTests } from './helpers/base';
-import { runRightToLeftTests } from './helpers/rightToLeft';
-import params from './helpers/params';
+import { runBaseTests } from './helpers/base.js';
+import { runRightToLeftTests } from './helpers/rightToLeft.js';
+import params from './helpers/params.js';
 
-import BookReader from './models/BookReader';
+import BookReader from './models/BookReader.js';
 
 const ocaids = params.ocaids || [
   'gendaitankashu00meijuoft', // Right to Left book

package/tests/e2e/viewmode.test.js

@@ -1,6 +1,6 @@
 import { Selector } from 'testcafe';
-import BookReader from './models/BookReader';
-import params from './helpers/params';
+import BookReader from './models/BookReader.js';
+import params from './helpers/params.js';
 
 const ocaids = params.ocaids || ['goody'];
 

package/tests/jest/BookNavigator/book-navigator.test.js

@@ -323,19 +323,6 @@ describe('<book-navigator>', () => {
         });
       });
 
-      describe('Shortcuts', () => {
-        test('has specific order of menu shortcuts to show', () => {
-          const el = fixtureSync(container());
-          expect(el.shortcutOrder).toEqual([
-            'fullscreen',
-            'volumes',
-            'chapters',
-            'search',
-            'bookmarks',
-          ]);
-        });
-      });
-
       describe('Behaviors for specific menus', () => {
         describe('Search menu - ref: plugin.search.js', () => {
           test('Event: listens for `BookReader:ToggleSearchMenu to open search side panel', async () => {

package/tests/jest/BookNavigator/downloads/downloads-provider.test.js

@@ -1,6 +1,6 @@
 import { fixtureCleanup, fixtureSync } from '@open-wc/testing-helpers';
 import sinon from 'sinon';
-import DownloadsProvider from '@/src/BookNavigator/downloads/downloads-provider';
+import DownloadsProvider from '@/src/BookNavigator/downloads/downloads-provider.js';
 
 const downloadableTypes = [
   ["PDF", "//archive.org/download/theworksofplato01platiala/theworksofplato01platiala.pdf"],

package/tests/jest/BookNavigator/downloads/downloads.test.js

@@ -4,7 +4,7 @@ import {
   fixtureCleanup,
 } from '@open-wc/testing-helpers';
 import sinon from 'sinon';
-import '@/src/BookNavigator/downloads/downloads';
+import '@/src/BookNavigator/downloads/downloads.js';
 
 
 const downloads = [

package/tests/jest/BookNavigator/search/search-provider.test.js

@@ -1,6 +1,6 @@
 import { fixtureCleanup, fixtureSync } from '@open-wc/testing-helpers';
 import sinon from 'sinon';
-import searchProvider from '@/src/BookNavigator/search/search-provider';
+import searchProvider from '@/src/BookNavigator/search/search-provider.js';
 
 afterEach(() => {
   sinon.restore();
@@ -88,7 +88,7 @@ describe('Search Provider', () => {
         onProviderChange: sinon.fake(),
         bookreader: {
           leafNumToIndex: sinon.fake(),
-          _plugins: {
+          plugins: {
             search: {
               jumpToMatch: sinon.fake(),
             },
@@ -104,7 +104,7 @@ describe('Search Provider', () => {
           { detail: searchResultStub }),
       );
 
-      expect(provider.bookreader._plugins.search.jumpToMatch.callCount).toEqual(1);
+      expect(provider.bookreader.plugins.search.jumpToMatch.callCount).toEqual(1);
     });
     test('update url when search is cancelled or input cleared', async() => {
       const urlPluginMock = {
@@ -115,7 +115,7 @@ describe('Search Provider', () => {
         onProviderChange: sinon.fake(),
         bookreader: {
           leafNumToIndex: sinon.fake(),
-          _plugins: {
+          plugins: {
             search: {
               jumpToMatch: sinon.fake(),
             },
@@ -153,7 +153,7 @@ describe('Search Provider', () => {
         onProviderChange: sinon.fake(),
         bookreader: {
           leafNumToIndex: sinon.fake(),
-          _plugins: {
+          plugins: {
             search: {
               jumpToMatch: sinon.fake(),
             },

package/tests/jest/BookReader/BookReaderPublicFunctions.test.js

@@ -1,4 +1,4 @@
-import BookReader from '@/src/BookReader';
+import BookReader from '@/src/BookReader.js';
 import { sleep } from '@/src/BookReader/utils.js';
 import sinon from 'sinon';
 

package/tests/jest/BookReader/Mode2Up.test.js

@@ -3,7 +3,7 @@ import sinon from 'sinon';
 import { Mode2Up } from '@/src/BookReader/Mode2Up.js';
 import BookReader from '@/src/BookReader.js';
 import { BookModel } from '@/src/BookReader/BookModel.js';
-import { afterEventLoop } from '../utils';
+import { afterEventLoop } from '../utils.js';
 /** @typedef {import('@/src/BookReader/options.js').BookReaderOptions} BookReaderOptions */
 
 beforeAll(() => {

package/tests/jest/BookReader/ModeCoordinateSpace.test.js

@@ -1,4 +1,4 @@
-import { ModeCoordinateSpace } from "@/src/BookReader/ModeCoordinateSpace";
+import { ModeCoordinateSpace } from "@/src/BookReader/ModeCoordinateSpace.js";
 
 describe("worldUnitsToRenderedPixels", () => {
   test("0 case", () => {

package/tests/jest/BookReader/PageContainer.test.js

@@ -52,15 +52,26 @@ describe('constructor', () => {
   });
 
   test('non-empty page', () => {
-    const pc = new PageContainer({index: 7}, {isProtected: false});
+    const page = {
+      index: 7,
+      getPageNum: () => '8',
+    };
+    const pc = new PageContainer(page, {isProtected: false});
     expect(pc.$container.hasClass('BRemptypage')).toBe(false);
     expect(pc.$container.hasClass('pagediv7')).toBe(true);
   });
 
-  test('adds side attribute', () => {
-    const pc = new PageContainer({index: 7, pageSide: 'R'}, {isProtected: false});
+  test('adds attributes', () => {
+    const page = {
+      index: 7,
+      pageSide: 'R',
+      getPageNum: () => '8',
+    };
+    const pc = new PageContainer(page, {isProtected: false});
     expect(pc.$container.hasClass('BRemptypage')).toBe(false);
     expect(pc.$container.attr('data-side')).toBe('R');
+    expect(pc.$container.attr('data-index')).toBe('7');
+    expect(pc.$container.attr('data-page-num')).toBe('8');
   });
 });
 

package/tests/jest/BookReader/utils/HTMLDimensionsCacher.test.js

@@ -1,6 +1,6 @@
 // @ts-check
 import  sinon from 'sinon';
-import { HTMLDimensionsCacher } from '@/src/BookReader/utils/HTMLDimensionsCacher';
+import { HTMLDimensionsCacher } from '@/src/BookReader/utils/HTMLDimensionsCacher.js';
 
 describe('HTMLDimensionsCacher', () => {
   test('Does not read from element directly', () => {

package/tests/jest/BookReader/utils/ScrollClassAdder.test.js

@@ -1,6 +1,6 @@
 // @ts-check
 import  sinon from 'sinon';
-import { ScrollClassAdder } from '@/src/BookReader/utils/ScrollClassAdder';
+import { ScrollClassAdder } from '@/src/BookReader/utils/ScrollClassAdder.js';
 
 describe('ScrollClassAdder', () => {
   test('Does not attach during construction', () => {

package/tests/jest/BookReader/utils/SelectionObserver.test.js

@@ -1,6 +1,6 @@
 // @ts-check
 import sinon from "sinon";
-import { SelectionObserver } from "@/src/BookReader/utils/SelectionObserver";
+import { SelectionObserver } from "@/src/BookReader/utils/SelectionObserver.js";
 
 afterEach(() => {
   sinon.restore();

package/tests/jest/BookReader.test.js

@@ -39,35 +39,35 @@ test('has registered fullscreen toggle event', () => {
 });
 
 test('checks cookie when initParams called', () => {
-  br._plugins.resume.getResumeValue = jest.fn(() => 15);
+  br.plugins.resume.getResumeValue = jest.fn(() => 15);
   br.urlReadFragment = jest.fn(() => '');
 
   const params = br.initParams();
-  expect(br._plugins.resume.getResumeValue).toHaveBeenCalledTimes(1);
+  expect(br.plugins.resume.getResumeValue).toHaveBeenCalledTimes(1);
   expect(params.init).toBe(true);
   expect(params.index).toBe(15);
   expect(params.fragmentChange).toBe(true);
 });
 
 test('does not check cookie when initParams called', () => {
-  br._plugins.resume.getResumeValue = jest.fn(() => null);
+  br.plugins.resume.getResumeValue = jest.fn(() => null);
   br.urlReadFragment = jest.fn(() => '');
   br.options.plugins.resume.enabled = false;
 
   const params = br.initParams();
-  expect(br._plugins.resume.getResumeValue).toHaveBeenCalledTimes(0);
+  expect(br.plugins.resume.getResumeValue).toHaveBeenCalledTimes(0);
   expect(params.init).toBe(true);
   expect(params.index).toBe(0);
   expect(params.fragmentChange).toBe(false);
 });
 
 test('gets index from fragment when both fragment and cookie when InitParams called', () => {
-  br._plugins.resume.getResumeValue = jest.fn(() => 15);
+  br.plugins.resume.getResumeValue = jest.fn(() => 15);
   br.urlReadFragment = jest.fn(() => 'page/n4');
   br.options.plugins.resume.enabled = true;
 
   const params = br.initParams();
-  expect(br._plugins.resume.getResumeValue).toHaveBeenCalledTimes(1);
+  expect(br.plugins.resume.getResumeValue).toHaveBeenCalledTimes(1);
   expect(params.init).toBe(true);
   expect(params.index).toBe(4);
   expect(params.fragmentChange).toBe(true);
@@ -117,7 +117,7 @@ test('has added BR property: bookPath', () => {
 });
 
 test('has suppressFragmentChange true when init with no input', () => {
-  br._plugins.resume.getResumeValue = jest.fn(() => null);
+  br.plugins.resume.getResumeValue = jest.fn(() => null);
   br.urlReadFragment = jest.fn(() => '');
   br.urlReadHashFragment = jest.fn(() => '');
   br.switchMode = jest.fn();
@@ -128,7 +128,7 @@ test('has suppressFragmentChange true when init with no input', () => {
 });
 
 test('has suppressFragmentChange false when init with cookie', () => {
-  br._plugins.resume.getResumeValue = jest.fn(() => 5);
+  br.plugins.resume.getResumeValue = jest.fn(() => 5);
   br.urlReadFragment = jest.fn(() => '');
   br.switchMode = jest.fn();
 
@@ -138,7 +138,7 @@ test('has suppressFragmentChange false when init with cookie', () => {
 });
 
 test('has suppressFragmentChange false when init with fragment', () => {
-  br._plugins.resume.getResumeValue = jest.fn(() => null);
+  br.plugins.resume.getResumeValue = jest.fn(() => null);
   br.urlReadFragment = jest.fn(() => 'mode/1up');
   br.switchMode = jest.fn();
 
@@ -148,7 +148,7 @@ test('has suppressFragmentChange false when init with fragment', () => {
 });
 
 test('has suppressFragmentChange false when init with hash fragment', () => {
-  br._plugins.resume.getResumeValue = jest.fn(() => null);
+  br.plugins.resume.getResumeValue = jest.fn(() => null);
   br.urlReadFragment = jest.fn(() => '');
   br.urlReadHashFragment = jest.fn(() => 'mode/1up');
   br.switchMode = jest.fn();

package/tests/jest/plugins/plugin.autoplay.test.js

@@ -15,21 +15,21 @@ afterEach(() => {
 
 describe('Plugin: Menu Toggle', () => {
   test('autoplay does not start when BookReaderInitializes', () => {
-    br._plugins.autoplay.toggle = jest.fn();
+    br.plugins.autoplay.toggle = jest.fn();
     br.init();
-    expect(br._plugins.autoplay.toggle).toHaveBeenCalledTimes(0);
+    expect(br.plugins.autoplay.toggle).toHaveBeenCalledTimes(0);
   });
   test('autoplay will run without `flipSpeed` parameters', () => {
-    const initialTimer = br._plugins.autoplay.timer;
+    const initialTimer = br.plugins.autoplay.timer;
     br.next = jest.fn();
-    br._plugins.autoplay.stop = jest.fn();
+    br.plugins.autoplay.stop = jest.fn();
     br.init();
-    br._plugins.autoplay.toggle();
+    br.plugins.autoplay.toggle();
     // internally referenced functions that fire
     expect(br.next).toHaveBeenCalledTimes(1);
 
     expect(initialTimer).toBeFalsy();
     // timer changes when autoplay turns on
-    expect(br._plugins.autoplay.timer).toBeTruthy();
+    expect(br.plugins.autoplay.timer).toBeTruthy();
   });
 });

package/tests/jest/plugins/plugin.chapters.test.js

@@ -2,8 +2,8 @@ import sinon from "sinon";
 
 import "@/src/BookReader.js";
 import {ChaptersPlugin} from "@/src/plugins/plugin.chapters.js";
-import { BookModel } from "@/src/BookReader/BookModel";
-import { deepCopy } from "../utils";
+import { BookModel } from "@/src/BookReader/BookModel.js";
+import { deepCopy } from "../utils.js";
 /** @typedef {import('@/src/plugins/plugin.chapters').TocEntry} TocEntry  */
 
 /** @type {TocEntry[]} */

package/tests/jest/plugins/plugin.resume.test.js

@@ -29,9 +29,9 @@ describe('updateResumeValue', () => {
     In this branch .toHaveBeenCalledTimes() === 1
   */
   test.skip('starts when BookReaderInit is called', () => {
-    br._plugins.resume.updateResumeValue = jest.fn();
+    br.plugins.resume.updateResumeValue = jest.fn();
     br.init();
-    expect(br._plugins.resume.updateResumeValue).toHaveBeenCalledTimes(2);
+    expect(br.plugins.resume.updateResumeValue).toHaveBeenCalledTimes(2);
   });
 
   test('handles cookieName=null', () => {
@@ -48,38 +48,38 @@ describe('updateResumeValue', () => {
   test('handles cookiePath not set', () => {
     const setItemSpy = sinon.spy(docCookies, 'setItem');
     // Save function
-    const saveFn = br._plugins.resume.getCookiePath;
-    br._plugins.resume.getCookiePath = jest.fn(() => '/details/foo');
-    br._plugins.resume.updateResumeValue(16);
+    const saveFn = br.plugins.resume.getCookiePath;
+    br.plugins.resume.getCookiePath = jest.fn(() => '/details/foo');
+    br.plugins.resume.updateResumeValue(16);
     expect(setItemSpy.args[0][3]).toEqual('/details/foo');
     // Restore function
-    br._plugins.resume.getCookiePath = saveFn;
+    br.plugins.resume.getCookiePath = saveFn;
   });
 
   test('handles cookie path from URL with decoration', () => {
     const complexPathWithPage = '/details/2008ELMValidityStudyFinalReportRevised/Executive%20Summary%20for%20the%20EPT%26ELM%20Validity%20Studie_20100603%20-%20Copy/page/n1/mode/2up';
     const complexPath = '/details/2008ELMValidityStudyFinalReportRevised/Executive%20Summary%20for%20the%20EPT%26ELM%20Validity%20Studie_20100603%20-%20Copy';
-    expect(br._plugins.resume.getCookiePath(complexPathWithPage))
+    expect(br.plugins.resume.getCookiePath(complexPathWithPage))
       .toEqual(complexPath);
 
-    expect(br._plugins.resume.getCookiePath('/details/item/mode/1up'))
+    expect(br.plugins.resume.getCookiePath('/details/item/mode/1up'))
       .toEqual('/details/item');
 
-    expect(br._plugins.resume.getCookiePath('/details/item/inside/a/long/path/model/is/used'))
+    expect(br.plugins.resume.getCookiePath('/details/item/inside/a/long/path/model/is/used'))
       .toEqual('/details/item/inside/a/long/path/model/is/used');
 
-    expect(br._plugins.resume.getCookiePath('/details/item/inside/a/long/path/mode/is/used'))
+    expect(br.plugins.resume.getCookiePath('/details/item/inside/a/long/path/mode/is/used'))
       .toEqual('/details/item/inside/a/long/path');
   });
 
   test('handles cookie path from URL with no decoration', () => {
-    expect(br._plugins.resume.getCookiePath('/details/item'))
+    expect(br.plugins.resume.getCookiePath('/details/item'))
       .toEqual('/details/item');
 
-    expect(br._plugins.resume.getCookiePath('/details/item/'))
+    expect(br.plugins.resume.getCookiePath('/details/item/'))
       .toEqual('/details/item/');
 
-    expect(br._plugins.resume.getCookiePath('/details/item/almost/any/kind/of/long/path'))
+    expect(br.plugins.resume.getCookiePath('/details/item/almost/any/kind/of/long/path'))
       .toEqual('/details/item/almost/any/kind/of/long/path');
   });
 });