Merge pull request #1358 from cdrini/rm-jsonp

Disable jsonp usage to make BR work with CSP
internetarchive · Dec 2, 2024 · 31b029c · 31b029c
2 parents ce47c72 + 9ba0f7c
commit 31b029c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/plugins/plugin.chapters.js b/src/plugins/plugin.chapters.js
@@ -163,11 +163,11 @@ BookReader.prototype.getOpenLibraryRecord = async function (olHost, ocaid) {
   const baseURL = `${olHost}/query.json?type=/type/edition&*=`;
   const fetchUrlByBookId = `${baseURL}&ocaid=${ocaid}`;
 
-  let data = await $.ajax({ url: fetchUrlByBookId, dataType: 'jsonp' });
+  let data = await $.ajax({ url: fetchUrlByBookId });
 
   if (!data || !data.length) {
     // try sourceid
-    data = await $.ajax({ url: `${baseURL}&source_records=ia:${ocaid}`, dataType: 'jsonp' });
+    data = await $.ajax({ url: `${baseURL}&source_records=ia:${ocaid}` });
   }
 
   return data?.[0];

diff --git a/src/plugins/search/plugin.search.js b/src/plugins/search/plugin.search.js
@@ -222,7 +222,6 @@ BookReader.prototype.search = async function(term = '', overrides = {}) {
   this.trigger('SearchStarted', { term: this.searchTerm, instance: this });
   callSearchResultsCallback(await $.ajax({
     url: url,
-    dataType: 'jsonp',
     cache: true,
     beforeSend: xhr => { this.searchXHR = xhr; },
   }));

diff --git a/src/plugins/tts/PageChunk.js b/src/plugins/tts/PageChunk.js
@@ -25,11 +25,11 @@ export default class PageChunk {
     const chunks = await $.ajax({
       type: 'GET',
       url: `https://${server}/BookReader/BookReaderGetTextWrapper.php`,
-      dataType:'jsonp',
       cache: true,
       data: {
         path: `${bookPath}_djvu.xml`,
         page: leafIndex,
+        callback: 'false',
       },
     });
     return PageChunk._fromTextWrapperResponse(leafIndex, chunks);