Merge pull request #2 from popiazaza/master

Fix @ bug when using non-English keyboard
jaideejung007 · Nov 26, 2021 · 763f015 · 763f015
2 parents b0f2224 + 82c543b
commit 763f015
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/upload/static/js/at.js b/upload/static/js/at.js
@@ -18,7 +18,7 @@ function extrafunc_atMenu() {
 	if(BROWSER.opera) {
 		return;
 	}
-	if(wysiwyg && EXTRAEVENT.shiftKey && EXTRAEVENT.keyCode == 50 && postaction && (postaction == 'newthread' || postaction == 'reply' || postaction == 'edit')) {
+	if(wysiwyg && EXTRAEVENT.key == '@' && postaction && (postaction == 'newthread' || postaction == 'reply' || postaction == 'edit')) {
 		keyMenu('@', atMenu);
 		ctlent_enable[13] = 0;
 		doane(EXTRAEVENT);
@@ -33,7 +33,7 @@ function extrafunc_atMenuKeyUp() {
 	if(BROWSER.opera) {
 		return;
 	}
-	if(wysiwyg && EXTRAEVENT.shiftKey && EXTRAEVENT.keyCode == 50 && postaction && (postaction == 'newthread' || postaction == 'reply' || postaction == 'edit') && !atkeypress) {
+	if(wysiwyg && EXTRAEVENT.key == '@' && postaction && (postaction == 'newthread' || postaction == 'reply' || postaction == 'edit') && !atkeypress) {
 		keyBackspace();
 		keyMenu('@', atMenu);
 		ctlent_enable[13] = 0;
@@ -189,4 +189,4 @@ function atMenuSet(kw) {
 		selection.addRange(range);
 	}
 	checkFocus();
-}
+}