[frio] Ensure tagsinput library is loaded in pages where new PM can be submitted

- The new private message page loads in a modal, requiring the base page to load them in advance

diff --git a/include/conversation.php b/include/conversation.php
index c668e53d9da656d3549c6328d54f7c86f6d0510f..aa807619eb8a7302e5f2711ca0899c69efb4c5c5 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -28,6 +28,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
+use Friendica\Core\Theme;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -354,6 +355,13 @@ function conv_get_blocklist()
  */
 function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0)
 {
+       $page = DI::page();
+
+       $page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
+       $page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
+       $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
+       $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
+
        $ssl_state = (local_user() ? true : false);
 
        $profile_owner = 0;

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 4a5aeefe4fd37ecacf767a7cfb14043c2f8522b0..6e8778f1794a2cb4f035fd5f34dbf2b343dd4c68 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -32,6 +32,7 @@ use Friendica\Core\ACL;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Theme;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -259,9 +260,12 @@ class Contact extends BaseModule
                $rel    = Strings::escapeTags(trim($_GET['rel']    ?? ''));
                $group  = Strings::escapeTags(trim($_GET['group']  ?? ''));
 
-               if (empty(DI::page()['aside'])) {
-                       DI::page()['aside'] = '';
-               }
+               $page = DI::page();
+
+               $page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
+               $page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
+               $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
+               $page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
 
                $contact = null;
                // @TODO: Replace with parameter from router