textbrowser 0.45.2 → 0.46.0

package/resources/resultsDisplay.js

@@ -1,8 +1,8 @@
 /* eslint-env browser */
 import rtlDetect from 'rtl-detect';
-import JsonRefs from 'json-refs';
 import {jml} from 'jamilih';
 
+import JsonRefs from './vendor/json-refs-min.js';
 import Templates from './templates/index.js';
 import {escapeHTML} from './utils/sanitize.js';
 import {
@@ -23,7 +23,7 @@ const getRawFieldValue = (v) => {
 
 const setAnchor = ({
   applicableBrowseFieldSet,
-  fieldValueAliasMapPreferred, ilRaw, iil, max, $p
+  fieldValueAliasMapPreferred, lParamRaw, lIndexedParam, max, $p
 }) => {
   const applicableBrowseFieldSchemaIndexes = applicableBrowseFieldSet.map((abfs) => {
     return abfs.fieldSchemaIndex;
@@ -32,7 +32,7 @@ const setAnchor = ({
     //   other anchor params)
   const work = $p.get('work');
   let anchor;
-  const anchorRowCol = ilRaw('anchorrowcol');
+  const anchorRowCol = lParamRaw('anchorrowcol');
   if (anchorRowCol) {
     anchor = Templates.resultsDisplayClient.anchorRowCol({anchorRowCol});
   }
@@ -51,7 +51,7 @@ const setAnchor = ({
           }
           break;
         }
-        anchorField = $p.get(iil('anchorfield') + i, true);
+        anchorField = $p.get(lIndexedParam('anchorfield') + i, true);
 
         const x = applicableBrowseFieldSchemaIndexes[j - 1];
         const rawVal = getRawFieldValue(anchor);
@@ -87,24 +87,23 @@ export const resultsDisplayClient = async function resultsDisplayClient (args) {
     browseFieldSets,
     applicableBrowseFieldSet,
     lang, metadataObj, fileData,
-    fieldValueAliasMapPreferred, lf, iil, ilRaw,
+    fieldValueAliasMapPreferred, workI18n, lIndexedParam, lParamRaw,
     templateArgs
   } = await resultsDisplayServerOrClient.call(this, {
     ...args, skipIndexedDB, prefI18n
   });
-  document.title = lf({
-    key: 'browserfile-resultsdisplay',
-    values: {
+  document.title = workI18n(
+    'browserfile-resultsdisplay',
+    {
       work: fileData
         ? getMetaProp(lang, metadataObj, 'alias')
         : ''
-    },
-    fallback: true
-  });
+    }
+  );
   Templates.resultsDisplayClient.main(templateArgs);
   setAnchor({
     applicableBrowseFieldSet,
-    fieldValueAliasMapPreferred, iil, ilRaw,
+    fieldValueAliasMapPreferred, lIndexedParam, lParamRaw,
     $p: args.$p,
     max: browseFieldSets.length
   });
@@ -134,13 +133,14 @@ export const resultsDisplayServer = async function resultsDisplayServer (args) {
     const jamilih = Templates.resultsDisplayServerOrClient.main(templateArgs);
     return jml.toHTML(...jamilih);
   }
-  case 'json': default:
+  // case 'json':
+  default:
     return templateArgs.tableData;
   }
 };
 
 export const resultsDisplayServerOrClient = async function resultsDisplayServerOrClient ({
-  l, lang, fallbackLanguages, imfLocales, $p, skipIndexedDB, noIndexedDB, prefI18n,
+  l, lang, fallbackLanguages, locales, $p, skipIndexedDB, noIndexedDB, prefI18n,
   files, allowPlugins, langData, basePath = '', dynamicBasePath = ''
 }) {
   const languages = new Languages({langData});
@@ -178,7 +178,12 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
       //   for a number representing a book); we may wish to
       //   switch this (and also for other browse field-based
       //   items).
-      if (fieldValueAliasMap[idx] !== undefined) {
+      if (
+        fieldValueAliasMap[idx] !== undefined &&
+        // Added this condition after imf->intl-dom conversion; concealing a
+        //   bug?
+        fieldValueAliasMap[idx] !== null
+      ) {
         return fieldValueAliasMapPreferred[idx][tr[idx]];
       }
       return tr[idx];
@@ -200,7 +205,12 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
       //   be multiple aliases for a value; we may wish to
       //   switch this (and also for other browse field-based
       //   items).
-      if (fieldValueAliasMap[idx] !== undefined) {
+      if (
+        fieldValueAliasMap[idx] !== undefined &&
+        // Added this condition after imf->intl-dom conversion; concealing a
+        //   bug?
+        fieldValueAliasMap[idx] !== null
+      ) {
         rowIDPartsPreferred.push(fieldValueAliasMapPreferred[idx][tr[idx]]);
       } else {
         rowIDPartsPreferred.push(tr[idx]);
@@ -398,7 +408,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
         return false;
       });
     }
-    reverseLocaleLookup(imfLocales);
+    reverseLocaleLookup(locales);
     if (!key && !avoidLog) {
       console.log('Bad param/value', param, '::', p);
     }
@@ -413,7 +423,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
   const escapeQuotedCSS = (s) => s.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 
   const {
-    fileData, lf, getFieldAliasOrName, schemaObj, metadataObj,
+    fileData, workI18n, getFieldAliasOrName, schemaObj, metadataObj,
     pluginsForWork
   } = await getWorkData({
     files: files || this.files,
@@ -484,7 +494,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
         const fieldAliasOrName = plugin.getFieldAliasOrName
           ? plugin.getFieldAliasOrName({
             locales: lang,
-            lf,
+            workI18n,
             targetLanguage,
             applicableField,
             applicableFieldI18N,
@@ -495,7 +505,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
           : languages.getFieldNameFromPluginNameAndLocales({
             pluginName,
             locales: lang,
-            lf,
+            workI18n,
             targetLanguage,
             applicableFieldI18N,
             // Todo: Should have formal way to i18nize meta
@@ -553,22 +563,22 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     : prefI18n === 'true' || (
       prefI18n !== 'false' && this.localizeParamNames
     );
-  const il = localizeParamNames
+  const lParam = localizeParamNames
     ? key => l(['params', key])
     : key => key;
-  const iil = localizeParamNames
+  const lIndexedParam = localizeParamNames
     ? key => l(['params', 'indexed', key])
     : key => key;
-  const ilRaw = localizeParamNames
-    ? (key, suffix = '') => $p.get(il(key) + suffix, true)
+  const lParamRaw = localizeParamNames
+    ? (key, suffix = '') => $p.get(lParam(key) + suffix, true)
     : (key, suffix = '') => $p.get(key + suffix, true);
-  const iilRaw = localizeParamNames
-    ? (key, suffix = '') => $p.get($p.get('work') + '-' + iil(key) + suffix, true)
+  const lIndexedParamRaw = localizeParamNames
+    ? (key, suffix = '') => $p.get($p.get('work') + '-' + lIndexedParam(key) + suffix, true)
     : (key, suffix = '') => $p.get($p.get('work') + '-' + key + suffix, true);
 
   // Now that we know `browseFieldSets`, we can parse `startEnd`
   const browseFieldSetStartEndIdx = browseFieldSets.findIndex((item, i) =>
-    iilRaw('startEnd', (i + 1))
+    lIndexedParamRaw('startEnd', (i + 1))
   );
   if (browseFieldSetStartEndIdx !== -1) {
     // Todo: i18nize (by work and/or by whole app?)
@@ -581,7 +591,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     // Todo: Change query beginning at 0 to 1 if none present?
     // Todo: Support i18nized or canonical aliases (but don't
     //         over-trim in such cases)
-    const rawSearch = (iilRaw('startEnd', browseFieldSetStartEndIdx + 1) || '').trim();
+    const rawSearch = (lIndexedParamRaw('startEnd', browseFieldSetStartEndIdx + 1) || '').trim();
     const [startFull, endFull] = rawSearch.split(rangeSep);
     if (endFull !== undefined) {
       const startPartVals = startFull.split(partSep);
@@ -605,7 +615,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
   }
 
   const browseFieldSetIdx = browseFieldSets.findIndex((item, i) =>
-    iilRaw('start', (i + 1) + '-1')
+    lIndexedParamRaw('start', (i + 1) + '-1')
   );
   const applicableBrowseFieldSet = browseFieldSets[browseFieldSetIdx];
   const applicableBrowseFieldSetName = setNames[browseFieldSetIdx];
@@ -635,7 +645,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
   });
   const showInterlinTitles = $pRaw('interlintitle') === '1';
 
-  console.log('rand', ilRaw('rand') === 'yes');
+  console.log('rand', lParamRaw('rand') === 'yes');
 
   const stripToRawFieldValue = (v, i) => {
     let val;
@@ -809,7 +819,7 @@ export const resultsDisplayServerOrClient = async function resultsDisplayServerO
     fieldInfo,
     $p,
     applicableBrowseFieldSet, fieldValueAliasMapPreferred,
-    lf, iil, ilRaw, browseFieldSets,
+    workI18n, lIndexedParam, lParamRaw, browseFieldSets,
     lang, metadataObj, fileData,
     templateArgs
   };

package/resources/templates/index.js

@@ -22,144 +22,157 @@ const Templates = {
     return jml('div', {
       id: 'main', role: 'main'
     }, body);
-  }
-};
-Templates.permissions = {
-  versionChange () {
-    $('#versionChange').showModal();
   },
-  addLogEntry ({text}) {
-    const installationDialog = $('#installationLogContainer');
-    try {
-      installationDialog.showModal();
+  permissions: {
+    versionChange () {
+      $('#versionChange').showModal();
+    },
+    addLogEntry ({text}) {
+      const installationDialog = $('#installationLogContainer');
+      try {
+        installationDialog.showModal();
+        const container = $('#dialogContainer');
+        container.hidden = false;
+      } catch (err) {
+        // May already be open
+      }
+      $('#installationLog').append(text + '\n');
+    },
+    exitDialogs () {
       const container = $('#dialogContainer');
-      container.hidden = false;
-    } catch (err) {
-      // May already be open
-    }
-    $('#installationLog').append(text + '\n');
-  },
-  exitDialogs () {
-    const container = $('#dialogContainer');
-    if (container) {
-      container.hidden = true;
-    }
-  },
-  dbError ({type, escapedErrorMessage}) {
-    if (type) {
-      jml('span', [
-        type, ' ',
-        escapedErrorMessage
-      ], $('#dbError'));
-    }
-    $('#dbError').showModal();
-  },
-  errorRegistering (escapedErrorMessage) {
-    if (escapedErrorMessage) {
-      jml('span', [escapedErrorMessage], $('#errorRegistering'));
-    }
-    $('#errorRegistering').showModal();
-  },
-  browserNotGrantingPersistence () {
-    $('#browserNotGrantingPersistence').showModal();
-  },
-  main ({l, ok, refuse, close, closeBrowserNotGranting}) {
-    const installationDialog = jml('dialog', {
-      style: 'text-align: center; height: 100%',
-      id: 'installationLogContainer',
-      class: 'focus'
-    }, [
-      ['p', [
-        l('wait-installing')
-      ]],
-      ['div', {style: 'height: 80%; overflow: auto;'}, [
-        ['pre', {id: 'installationLog'}, [
+      if (container) {
+        container.hidden = true;
+      }
+    },
+    dbError ({type, escapedErrorMessage}) {
+      if (type) {
+        jml('span', [
+          type, ' ',
+          escapedErrorMessage
+        ], $('#dbError'));
+      }
+      $('#dbError').showModal();
+    },
+    errorRegistering (escapedErrorMessage) {
+      if (escapedErrorMessage) {
+        jml('span', [escapedErrorMessage], $('#errorRegistering'));
+      }
+      $('#errorRegistering').showModal();
+    },
+    browserNotGrantingPersistence () {
+      $('#browserNotGrantingPersistence').showModal();
+    },
+    /**
+     * @param {PlainObject} cfg
+     * @param {I18NCallback} cfg.siteI18n
+     * @param {() => Promise<void>} cfg.ok
+     * @param {() => void} cfg.refuse
+     * @param {() => Promise<void>} cfg.close
+     * @param {() => void} cfg.closeBrowserNotGranting
+     * @returns {[
+     *   HTMLDialogElement, HTMLDialogElement, HTMLDialogElement,
+     *   HTMLDialogElement, HTMLDialogElement, HTMLDialogElement
+     * ]}
+     */
+    main ({siteI18n, ok, refuse, close, closeBrowserNotGranting}) {
+      const installationDialog = jml('dialog', {
+        style: 'text-align: center; height: 100%',
+        id: 'installationLogContainer',
+        class: 'focus'
+      }, [
+        ['p', [
+          siteI18n('wait-installing')
+        ]],
+        ['div', {style: 'height: 80%; overflow: auto;'}, [
+          ['pre', {id: 'installationLog'}, [
+          ]]
         ]]
-      ]]
-      // ['textarea', {readonly: true, style: 'width: 80%; height: 80%;'}]
-    ]);
-    let requestPermissionsDialog = '';
-    if (ok) {
-      requestPermissionsDialog = jml(
+        // ['textarea', {readonly: true, style: 'width: 80%; height: 80%;'}]
+      ]);
+      let requestPermissionsDialog = '';
+      if (ok) {
+        requestPermissionsDialog = jml(
+          'dialog', {
+            id: 'willRequestStoragePermissions',
+            $on: {close}
+          }, [
+            ['section', [
+              siteI18n('will-request-storage-permissions')
+            ]],
+            ['br'],
+            ['div', {class: 'focus'}, [
+              ['button', {$on: {click: ok}}, [
+                siteI18n('OK')
+              ]],
+              ['br'], ['br'],
+              ['button', {$on: {click: refuse}}, [
+                siteI18n('refuse-request-storage-permissions')
+              ]]
+            ]]
+          ]
+        );
+      }
+      const errorRegisteringNotice = jml(
         'dialog', {
-          id: 'willRequestStoragePermissions',
-          $on: {close}
+          id: 'errorRegistering'
         }, [
           ['section', [
-            l('will-request-storage-permissions')
-          ]],
-          ['br'],
-          ['div', {class: 'focus'}, [
-            ['button', {$on: {click: ok}}, [
-              l('OK')
+            siteI18n('errorRegistering')
+          ]]
+        ]
+      );
+      let browserNotGrantingPersistenceAlert = '';
+      if (closeBrowserNotGranting) {
+        browserNotGrantingPersistenceAlert = jml(
+          'dialog', {
+            id: 'browserNotGrantingPersistence'
+          }, [
+            ['section', [
+              siteI18n('browser-not-granting-persistence')
             ]],
-            ['br'], ['br'],
-            ['button', {$on: {click: refuse}}, [
-              l('refuse-request-storage-permissions')
+            ['br'],
+            ['div', {class: 'focus'}, [
+              ['button', {$on: {click: closeBrowserNotGranting}}, [
+                siteI18n('OK')
+              ]]
             ]]
+          ]
+        );
+      }
+      const versionChangeNotice = jml(
+        'dialog', {
+          id: 'versionChange'
+        }, [
+          ['section', [
+            siteI18n('versionChange')
           ]]
         ]
       );
-    }
-    const errorRegisteringNotice = jml(
-      'dialog', {
-        id: 'errorRegistering'
-      }, [
-        ['section', [
-          l('errorRegistering')
-        ]]
-      ]
-    );
-    let browserNotGrantingPersistenceAlert = '';
-    if (closeBrowserNotGranting) {
-      browserNotGrantingPersistenceAlert = jml(
+      const dbErrorNotice = jml(
         'dialog', {
-          id: 'browserNotGrantingPersistence'
+          id: 'dbError'
         }, [
           ['section', [
-            l('browser-not-granting-persistence')
-          ]],
-          ['br'],
-          ['div', {class: 'focus'}, [
-            ['button', {$on: {click: closeBrowserNotGranting}}, [
-              l('OK')
-            ]]
+            siteI18n('dbError')
           ]]
         ]
       );
-    }
-    const versionChangeNotice = jml(
-      'dialog', {
-        id: 'versionChange'
-      }, [
-        ['section', [
-          l('versionChange')
-        ]]
-      ]
-    );
-    const dbErrorNotice = jml(
-      'dialog', {
-        id: 'dbError'
-      }, [
-        ['section', [
-          l('dbError')
-        ]]
-      ]
-    );
-    jml('div', {id: 'dialogContainer', style: 'height: 100%'}, [
-      installationDialog,
-      requestPermissionsDialog,
-      browserNotGrantingPersistenceAlert,
-      errorRegisteringNotice,
-      versionChangeNotice,
-      dbErrorNotice
-    ], $('#main'));
+      jml('div', {id: 'dialogContainer', style: 'height: 100%'}, [
+        installationDialog,
+        requestPermissionsDialog,
+        browserNotGrantingPersistenceAlert,
+        errorRegisteringNotice,
+        versionChangeNotice,
+        dbErrorNotice
+      ], $('#main'));
 
-    return [
-      installationDialog,
-      requestPermissionsDialog, browserNotGrantingPersistenceAlert,
-      errorRegisteringNotice, versionChangeNotice, dbErrorNotice
-    ];
+      return [
+        installationDialog,
+        requestPermissionsDialog,
+        browserNotGrantingPersistenceAlert,
+        errorRegisteringNotice, versionChangeNotice, dbErrorNotice
+      ];
+    }
   }
 };
 export default Templates;

package/resources/templates/resultsDisplayClient.js

@@ -20,6 +20,8 @@ export default {
     } catch (err) {
       if (err.message === 'JSON support is currently not available') {
         dialogs.alert(err.message);
+      } else {
+        console.error(err);
       }
     }
     jml(...html, $('#main'));