@internetarchive/bookreader 5.0.0-55 → 5.0.0-57

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

@@ -124,7 +124,7 @@ BookReader.prototype.urlStartLocationPolling = function() {
  */
 BookReader.prototype.urlUpdateFragment = function() {
   const allParams = this.paramsFromCurrent();
-  const { urlMode, urlTrackIndex0, urlTrackedParams } = this.options;
+  const { urlTrackIndex0, urlTrackedParams } = this.options;
 
   if (!urlTrackIndex0
       && (typeof(allParams.index) !== 'undefined')
@@ -140,29 +140,36 @@ BookReader.prototype.urlUpdateFragment = function() {
     return validParams;
   }, {});
 
-  const newFragment = this.fragmentFromParams(params, urlMode);
+  const newFragment = this.fragmentFromParams(params, this.options.urlMode);
   const currFragment = this.urlReadFragment();
   const currQueryString = this.getLocationSearch();
-  const newQueryString = this.queryStringFromParams(params, currQueryString, urlMode);
+  const newQueryString = this.queryStringFromParams(params, currQueryString, this.options.urlMode);
   if (currFragment === newFragment && currQueryString === newQueryString) {
     return;
   }
 
-  if (urlMode === 'history') {
-    if (window.history && window.history.replaceState) {
+  if (this.options.urlMode === 'history') {
+    if (!window.history || !window.history.replaceState) {
+      this.options.urlMode = 'hash';
+    } else {
       const baseWithoutSlash = this.options.urlHistoryBasePath.replace(/\/+$/, '');
       const newFragmentWithSlash = newFragment === '' ? '' : `/${newFragment}`;
 
       const newUrlPath = `${baseWithoutSlash}${newFragmentWithSlash}${newQueryString}`;
-      window.history.replaceState({}, null, newUrlPath);
-      this.oldLocationHash = newFragment + newQueryString;
-
+      try {
+        window.history.replaceState({}, null, newUrlPath);
+        this.oldLocationHash = newFragment + newQueryString;
+      } catch (e) {
+        // DOMException on Chrome when in sandboxed iframe
+        this.options.urlMode = 'hash';
+      }
     }
-  } else {
+  }
+
+  if (this.options.urlMode === 'hash')  {
     const newQueryStringSearch = this.urlParamsFiltersOnlySearch(this.readQueryString());
     window.location.replace('#' + newFragment + newQueryStringSearch);
     this.oldLocationHash = newFragment + newQueryStringSearch;
-
   }
 };
 

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

@@ -148,6 +148,9 @@ describe('<book-navigator>', () => {
         el.bookreader = brStub;
         await el.elementUpdated;
 
+        el.downloadableTypes = ['foo/bar'];
+        await el.elementUpdated;
+
         el.initializeBookSubmenus();
         await el.elementUpdated;
         const defaultMenus = Object.keys(el.menuProviders);
@@ -229,6 +232,27 @@ describe('<book-navigator>', () => {
         expect(baseConfigKeys).toContain('isAdmin');
         expect(baseConfigKeys).toContain('onProviderChange');
       });
+
+      test('Downloads panel - does not show if no available `downloadableTypes`', async () => {
+        const el = fixtureSync(container());
+        const $brContainer = document.createElement('div');
+        const brStub = {
+          resize: sinon.fake(),
+          currentIndex: sinon.fake(),
+          jumpToIndex: sinon.fake(),
+          options: {},
+          refs: {
+            $brContainer
+          }
+        };
+        el.bookreader = brStub;
+        await el.elementUpdated;
+
+        el.initializeBookSubmenus();
+        await el.elementUpdated;
+        const defaultMenus = Object.keys(el.menuProviders);
+        expect(defaultMenus.find(menu => menu === 'downloads')).toBeUndefined;
+      });
     });
 
     describe('Controlling Menu Side Panel & Shortcuts', () => {

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

@@ -114,6 +114,26 @@ describe('Plugin: URL controller', () => {
     expect(window.history.replaceState).toHaveBeenCalled();
   });
 
+  test('switches to hashMode if replaceState errors', () => {
+    window.history.replaceState = jest.fn(() => {
+      throw new Error('foo');
+    });
+    BookReader.prototype.currentIndex = jest.fn(() => 1);
+    BookReader.prototype.urlReadFragment = jest.fn(() => '');
+    BookReader.prototype.paramsFromCurrent = jest.fn(() => ({
+      index: 1,
+      mode: 2,
+      view: 'theater'
+    }));
+    BookReader.prototype.search = jest.fn();
+    br.options.urlMode = 'history';
+    br.init();
+    br.urlUpdateFragment();
+
+    expect(window.history.replaceState).toHaveBeenCalled();
+    expect(br.options.urlMode).toEqual('hash');
+  });
+
   test('does not update URL when search in query string', () => {
     window.history.replaceState = jest.fn();
     BookReader.prototype.currentIndex = jest.fn(() => 1);