summaryrefslogtreecommitdiff
path: root/ext/fg/js
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-07-25 09:58:06 -0400
committerGitHub <noreply@github.com>2020-07-25 09:58:06 -0400
commit4a43b41f79d46b8a677bbfb11c27d43e126e670f (patch)
tree93730428d5caaf8076f796349b9bf38e11ef8bfe /ext/fg/js
parent64ddb4d9011c3577bf70d746bc91787983ec12b5 (diff)
Set content refactor (#686)
* Simplify invoke * Pass isTerms instead of type * Update DisplaySearch.setContent to pass argument array * Simplify argument object structure for setContent * Move focus and disableHistory level * Always include focus and disableHistory options * Change disableHistory to history * Pass source text to setContent * Use consistent argument/object field order * Remove unused previous field * Combine logic for forward/back navigation
Diffstat (limited to 'ext/fg/js')
-rw-r--r--ext/fg/js/frontend.js20
-rw-r--r--ext/fg/js/popup.js2
2 files changed, 14 insertions, 8 deletions
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 49cf4ca6..73cea841 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -426,12 +426,21 @@ class Frontend {
this._showPopupContent(
textSource,
optionsContext,
- type,
- {definitions, context: {sentence, url, focus, disableHistory: true}}
+ {
+ focus,
+ history: false,
+ type,
+ source: textSource.text(),
+ definitions,
+ context: {
+ sentence,
+ url
+ }
+ }
);
}
- _showPopupContent(textSource, optionsContext, type=null, details=null) {
+ _showPopupContent(textSource, optionsContext, details=null) {
this._lastShowPromise = this._popup.showContent(
{
source: this._id,
@@ -439,10 +448,7 @@ class Frontend {
elementRect: textSource.getRect(),
writingMode: textSource.getWritingMode()
},
- {
- type,
- details
- }
+ details
);
this._lastShowPromise.catch((error) => {
if (yomichan.isExtensionUnloaded) { return; }
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 6f2f0a88..281913c6 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -146,7 +146,7 @@ class Popup {
}
if (displayDetails !== null) {
- this._invokeApi('setContent', {type: displayDetails.type, details: displayDetails.details});
+ this._invokeApi('setContent', {details: displayDetails});
}
}