Merge branch 'master' into testing

4 files changed, 70 insertions, 5 deletions

diff --git a/ext/bg/js/settings/anki-templates.js b/ext/bg/js/settings/anki-templates.js
index c5222d30..e3852eb4 100644
--- a/ext/bg/js/settings/anki-templates.js
+++ b/ext/bg/js/settings/anki-templates.js
@@ -99,10 +99,15 @@ async function ankiTemplatesValidate(infoNode, field, mode, showSuccessResult, i
         const definition = await ankiTemplatesValidateGetDefinition(text, optionsContext);
         if (definition !== null) {
             const options = await apiOptionsGet(optionsContext);
+            const context = {
+                document: {
+                    title: document.title
+                }
+            };
             let templates = options.anki.fieldTemplates;
             if (typeof templates !== 'string') { templates = await apiGetDefaultAnkiFieldTemplates(); }
             const ankiNoteBuilder = new AnkiNoteBuilder({renderTemplate: apiTemplateRender});
-            result = await ankiNoteBuilder.formatField(field, definition, mode, options, templates, exceptions);
+            result = await ankiNoteBuilder.formatField(field, definition, mode, context, options, templates, exceptions);
         }
     } catch (e) {
         exceptions.push(e);
diff --git a/ext/bg/js/settings/anki.js b/ext/bg/js/settings/anki.js
index b706cd1b..f2e1ca76 100644
--- a/ext/bg/js/settings/anki.js
+++ b/ext/bg/js/settings/anki.js
@@ -243,6 +243,7 @@ function ankiGetFieldMarkers(type) {
                 'cloze-prefix',
                 'cloze-suffix',
                 'dictionary',
+                'document-title',
                 'expression',
                 'furigana',
                 'furigana-plain',
@@ -258,6 +259,7 @@ function ankiGetFieldMarkers(type) {
             return [
                 'character',
                 'dictionary',
+                'document-title',
                 'glossary',
                 'kunyomi',
                 'onyomi',
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index 5e59cc3d..33ced3b9 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -199,11 +199,16 @@ class SettingsDictionaryEntryUI {
         this.allowSecondarySearchesCheckbox = this.content.querySelector('.dict-allow-secondary-searches');
         this.priorityInput = this.content.querySelector('.dict-priority');
         this.deleteButton = this.content.querySelector('.dict-delete-button');
+        this.detailsToggleLink = this.content.querySelector('.dict-details-toggle-link');
+        this.detailsContainer = this.content.querySelector('.dict-details');
+        this.detailsTable = this.content.querySelector('.dict-details-table');
 
         if (this.dictionaryInfo.version < 3) {
             this.content.querySelector('.dict-outdated').hidden = false;
         }
 
+        this.setupDetails(dictionaryInfo);
+
         this.content.querySelector('.dict-title').textContent = this.dictionaryInfo.title;
         this.content.querySelector('.dict-revision').textContent = `rev.${this.dictionaryInfo.revision}`;
         this.content.querySelector('.dict-prefix-wildcard-searches-supported').checked = !!this.dictionaryInfo.prefixWildcardsSupported;
@@ -214,6 +219,45 @@ class SettingsDictionaryEntryUI {
         this.eventListeners.addEventListener(this.allowSecondarySearchesCheckbox, 'change', this.onAllowSecondarySearchesChanged.bind(this), false);
         this.eventListeners.addEventListener(this.priorityInput, 'change', this.onPriorityChanged.bind(this), false);
         this.eventListeners.addEventListener(this.deleteButton, 'click', this.onDeleteButtonClicked.bind(this), false);
+        this.eventListeners.addEventListener(this.detailsToggleLink, 'click', this.onDetailsToggleLinkClicked.bind(this), false);
+    }
+
+    setupDetails(dictionaryInfo) {
+        const targets = [
+            ['Author', 'author'],
+            ['URL', 'url'],
+            ['Description', 'description'],
+            ['Attribution', 'attribution']
+        ];
+
+        let count = 0;
+        for (const [label, key] of targets) {
+            const info = dictionaryInfo[key];
+            if (typeof info !== 'string') { continue; }
+
+            const n1 = document.createElement('div');
+            n1.className = 'dict-details-entry';
+            n1.dataset.type = key;
+
+            const n2 = document.createElement('span');
+            n2.className = 'dict-details-entry-label';
+            n2.textContent = `${label}:`;
+            n1.appendChild(n2);
+
+            const n3 = document.createElement('span');
+            n3.className = 'dict-details-entry-info';
+            n3.textContent = info;
+            n1.appendChild(n3);
+
+            this.detailsTable.appendChild(n1);
+
+            ++count;
+        }
+
+        if (count === 0) {
+            this.detailsContainer.hidden = true;
+            this.detailsToggleLink.hidden = true;
+        }
     }
 
     cleanup() {
@@ -318,6 +362,12 @@ class SettingsDictionaryEntryUI {
         document.querySelector('#dict-remove-modal-dict-name').textContent = title;
         $(n).modal('show');
     }
+
+    onDetailsToggleLinkClicked(e) {
+        e.preventDefault();
+
+        this.detailsContainer.hidden = !this.detailsContainer.hidden;
+    }
 }
 
 class SettingsDictionaryExtraUI {
@@ -505,7 +555,7 @@ function dictionaryErrorsShow(errors) {
     if (errors !== null && errors.length > 0) {
         const uniqueErrors = new Map();
         for (let e of errors) {
-            console.error(e);
+            logError(e);
             e = dictionaryErrorToString(e);
             let count = uniqueErrors.get(e);
             if (typeof count === 'undefined') {
@@ -643,9 +693,9 @@ async function onDictionaryImport(e) {
             await settingsSaveOptions();
 
             if (errors.length > 0) {
-                errors.push(...errors);
-                errors.push(`Dictionary may not have been imported properly: ${errors.length} error${errors.length === 1 ? '' : 's'} reported.`);
-                dictionaryErrorsShow(errors);
+                const errors2 = errors.map((error) => jsonToError(error));
+                errors2.push(`Dictionary may not have been imported properly: ${errors2.length} error${errors2.length === 1 ? '' : 's'} reported.`);
+                dictionaryErrorsShow(errors2);
             }
 
             onDatabaseUpdated();
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index ebc443df..1653ee35 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -84,6 +84,10 @@ async function formRead(options) {
     options.general.popupScalingFactor = parseFloat($('#popup-scaling-factor').val());
     options.general.popupScaleRelativeToPageZoom = $('#popup-scale-relative-to-page-zoom').prop('checked');
     options.general.popupScaleRelativeToVisualViewport = $('#popup-scale-relative-to-visual-viewport').prop('checked');
+    options.general.showPitchAccentDownstepNotation = $('#show-pitch-accent-downstep-notation').prop('checked');
+    options.general.showPitchAccentPositionNotation = $('#show-pitch-accent-position-notation').prop('checked');
+    options.general.showPitchAccentGraph = $('#show-pitch-accent-graph').prop('checked');
+    options.general.showIframePopupsInRootFrame = $('#show-iframe-popups-in-root-frame').prop('checked');
     options.general.popupTheme = $('#popup-theme').val();
     options.general.popupOuterTheme = $('#popup-outer-theme').val();
     options.general.customPopupCss = $('#custom-popup-css').val();
@@ -161,6 +165,10 @@ async function formWrite(options) {
     $('#popup-scaling-factor').val(options.general.popupScalingFactor);
     $('#popup-scale-relative-to-page-zoom').prop('checked', options.general.popupScaleRelativeToPageZoom);
     $('#popup-scale-relative-to-visual-viewport').prop('checked', options.general.popupScaleRelativeToVisualViewport);
+    $('#show-pitch-accent-downstep-notation').prop('checked', options.general.showPitchAccentDownstepNotation);
+    $('#show-pitch-accent-position-notation').prop('checked', options.general.showPitchAccentPositionNotation);
+    $('#show-pitch-accent-graph').prop('checked', options.general.showPitchAccentGraph);
+    $('#show-iframe-popups-in-root-frame').prop('checked', options.general.showIframePopupsInRootFrame);
     $('#popup-theme').val(options.general.popupTheme);
     $('#popup-outer-theme').val(options.general.popupOuterTheme);
     $('#custom-popup-css').val(options.general.customPopupCss);