rewrite atwho in plain JS

SimpleMachines · Dec 8, 2024 · 73b3302 · 73b3302
1 parent b9949c2
commit 73b3302
Show file tree

Hide file tree

Showing 7 changed files with 1,398 additions and 49 deletions.
diff --git a/Sources/Actions/Display.php b/Sources/Actions/Display.php
@@ -1009,8 +1009,9 @@ protected function setupTemplate(): void
 
 		// Mentions
 		if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention')) {
-			Theme::loadJavaScriptFile('jquery.atwho.min.js', ['defer' => true], 'smf_atwho');
-			Theme::loadJavaScriptFile('jquery.caret.min.js', ['defer' => true], 'smf_caret');
+			Theme::loadJavaScriptFile('caret.js', ['defer' => true, 'minimize' => true], 'smf_caret');
+			Theme::loadCSSFile('atwho.css', ['minimize' => true], 'smf_atwho');
+			Theme::loadJavaScriptFile('atwho.js', ['defer' => true, 'minimize' => true], 'smf_atwho');
 			Theme::loadJavaScriptFile('mentions.js', ['defer' => true, 'minimize' => true], 'smf_mentions');
 		}
 

diff --git a/Sources/Actions/Post.php b/Sources/Actions/Post.php
@@ -347,9 +347,12 @@ public function show(): void
 
 		// Mentions
 		if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention')) {
-			Theme::loadJavaScriptFile('jquery.caret.min.js', ['defer' => true], 'smf_caret');
-			Theme::loadJavaScriptFile('jquery.atwho.min.js', ['defer' => true], 'smf_atwho');
-			Theme::loadJavaScriptFile('mentions.js', ['defer' => true, 'minimize' => true], 'smf_mentions');
+			Theme::loadCSSFile('atwho.css', ['minimize' => true], 'smf_atwho');
+			Theme::loadJavaScriptFile('atwho.js', ['demfer' => true, 'minimize' => true], 'smf_atwho');
+			Theme::loadJavaScriptFile('caret.js', ['dmefer' => true, 'minimize' => true], 'smf_caret');
+			//~ Theme::loadJavaScriptFile('jquery.atwho.min.js', ['defer' => true], 'smf_atwho');
+			//~ Theme::loadJavaScriptFile('jquery.caret.min.js', ['defer' => true], 'smf_caret');
+			Theme::loadJavaScriptFile('mentions.js', ['mdefer' => true, 'minimize' => true], 'smf_mentions');
 		}
 
 		// Load the drafts.js file