summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-09-14 14:32:23 +0300
committerAndrew Dolgov <[email protected]>2020-09-14 14:32:23 +0300
commit2f63f918e7300e809ae0800aa79a30c79e4a148c (patch)
treec3a5f21ecf34793cae9cb88c0f576b8eb6f3bc77
parent3e244fc9bb11cf88ca042b26d4242c8a9b69670d (diff)
when looking up words, strip hyphens
-rw-r--r--backend.php5
-rw-r--r--js/dict.js2
2 files changed, 5 insertions, 2 deletions
diff --git a/backend.php b/backend.php
index 4ed612b..a5dc56e 100644
--- a/backend.php
+++ b/backend.php
@@ -244,7 +244,10 @@
if (defined('DICT_ENABLED') && DICT_ENABLED) {
- $word = escapeshellarg($_REQUEST["word"]);
+ /* strip hyphens */
+ $word = str_replace("­", "", $_REQUEST["word"]);
+
+ $word = escapeshellarg($word);
exec(DICT_CLIENT . " -h ". DICT_SERVER ." $word 2>&1", $output, $rc);
diff --git a/js/dict.js b/js/dict.js
index 1c802e7..d85b75c 100644
--- a/js/dict.js
+++ b/js/dict.js
@@ -10,7 +10,7 @@ $(document).ready(function() {
const sel = getSelection().toString().trim();
- if (sel.match(/^\w+$/)) {
+ if (sel.match(/^[\w­]+$/)) {
Reader.lookupWord(sel, function() {
if (typeof EpubeApp != "undefined")
EpubeApp.showActionBar(false);