summaryrefslogtreecommitdiff
path: root/ext/fg/js
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-07-26 16:51:54 -0400
committerGitHub <noreply@github.com>2020-07-26 16:51:54 -0400
commit208217198e9228699e7299f06d3701899d44d8bb (patch)
treeaae11d6af70bac0c61774b8f611d9117101a288f /ext/fg/js
parente153971cd4a5768a6c7dc9df36cf446cf298227d (diff)
Display history refactor (#691)
* Create DisplayHistory * Change arguments for _setContentTermsOrKanji * Set up history-driven content updates * Use new history only * Load definitions if missing * Refactor definitions getting * Add support for wildcards * Move definitions setup * Add events * Allow state change even if there is no history state * Update search page to use history * Fix history overwriting * Fix search page not seeing state chang events during prepare * Update state if necessary * Don't reassign query text if the same * Remove DisplayContext * Initialize with real history state * Track URL * Update DisplayHistory to support pseudo-history * Configure history settings on search page * Fix state * Use full URL * Change data format of setContent * Rename details to content * Update event arguments * Fix animation * Remove old state changes * Clear content properly * Remove set/clear content overrides * Fix setting up event listeners for content clear * Make clearContent private * Make focus opt-in * Validate source * Add unloaded type * Generalize content params * Update how extension unload content is assigned * Restore query blurring
Diffstat (limited to 'ext/fg/js')
-rw-r--r--ext/fg/js/float.js2
-rw-r--r--ext/fg/js/frontend.js13
2 files changed, 11 insertions, 4 deletions
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index f23a9b93..513ee178 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -50,6 +50,8 @@ class DisplayFloat extends Display {
]);
window.addEventListener('message', this._onWindowMessage.bind(this), false);
+ this.initializeState();
+
this._frameEndpoint.signal();
}
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 73cea841..09928cd4 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -429,12 +429,17 @@ class Frontend {
{
focus,
history: false,
- type,
- source: textSource.text(),
- definitions,
- context: {
+ params: {
+ type,
+ query: textSource.text(),
+ wildcards: 'off'
+ },
+ state: {
sentence,
url
+ },
+ content: {
+ definitions
}
}
);