summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsiikamiika <siikamiika@users.noreply.github.com>2019-08-28 01:08:45 +0300
committertoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-09-02 19:33:52 -0400
commit87ff5cb19bc78244faafcfcb54d8428b2ed978f6 (patch)
tree0ddc055137a247a7b7d0be24598bfec52b3e3a85
parent71471d08e56f1a2431e67d0439724cc52a1ea73e (diff)
make containsPoint async everywhere
-rw-r--r--ext/fg/js/frontend.js2
-rw-r--r--ext/fg/js/popup-proxy-host.js2
-rw-r--r--ext/fg/js/popup-proxy.js10
-rw-r--r--ext/fg/js/popup.js2
4 files changed, 4 insertions, 12 deletions
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index f59ea318..1dff6fb9 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -294,7 +294,7 @@ class Frontend {
async searchAt(point, type) {
if (
this.pendingLookup ||
- (this.popup.containsPointIsAsync() ? await this.popup.containsPointAsync(point) : this.popup.containsPoint(point))
+ await this.popup.containsPoint(point)
) {
return;
}
diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index cdd1d02c..1048f410 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -110,7 +110,7 @@ class PopupProxyHost {
async containsPoint(id, point) {
const popup = this.getPopup(id);
- return popup.containsPointIsAsync() ? await popup.containsPointAsync(point) : popup.containsPoint(point);
+ return await popup.containsPoint(point);
}
async termsShow(id, elementRect, definitions, options, context) {
diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js
index bbf6a2cf..112b998e 100644
--- a/ext/fg/js/popup-proxy.js
+++ b/ext/fg/js/popup-proxy.js
@@ -69,21 +69,13 @@ class PopupProxy {
return await this.invokeHostApi('setVisible', {id, visible});
}
- containsPoint() {
- throw 'Non-async function not supported';
- }
-
- async containsPointAsync(point) {
+ async containsPoint(point) {
if (this.id === null) {
return false;
}
return await this.invokeHostApi('containsPoint', {id: this.id, point});
}
- containsPointIsAsync() {
- return true;
- }
-
async termsShow(elementRect, definitions, options, context) {
const id = await this.getPopupId();
elementRect = PopupProxy.DOMRectToJson(elementRect);
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index ab1dbbed..6b757472 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -248,7 +248,7 @@ class Popup {
}
}
- containsPoint(point) {
+ async containsPoint(point) {
if (!this.isVisible()) {
return false;
}