From 67bc9c1bcbe81ccf25bfdd7ddf58a4b116406388 Mon Sep 17 00:00:00 2001 From: mrilyew <99399973+mrilyew@users.noreply.github.com> Date: Sun, 1 Dec 2024 21:53:15 +0300 Subject: [PATCH] Fix main problems --- Web/Presenters/MessengerPresenter.php | 1 + Web/Presenters/templates/@layout.xml | 5 + Web/Presenters/templates/Apps/Edit.xml | 8 +- Web/Presenters/templates/Apps/Play.xml | 26 +--- Web/Presenters/templates/Audio/tabs.xml | 2 +- Web/Presenters/templates/Group/Followers.xml | 25 +--- Web/Presenters/templates/Group/View.xml | 28 +--- Web/Presenters/templates/Notes/List.xml | 4 +- Web/Presenters/templates/Notes/View.xml | 2 +- .../templates/Photos/UploadPhoto.xml | 8 +- Web/Presenters/templates/Topics/Create.xml | 7 - Web/Presenters/templates/User/Edit.xml | 11 -- Web/Presenters/templates/User/Settings.xml | 24 ---- Web/Presenters/templates/User/View.xml | 4 +- Web/Presenters/templates/User/private.xml | 27 +--- .../templates/components/comment.xml | 25 +--- .../templates/components/textArea.xml | 7 - Web/static/js/al_music.js | 14 ++ Web/static/js/al_photos.js | 16 +-- Web/static/js/al_wall.js | 126 ++++++++++++++++++ Web/static/js/router.js | 9 +- Web/static/js/utils.js | 9 +- 22 files changed, 185 insertions(+), 203 deletions(-) diff --git a/Web/Presenters/MessengerPresenter.php b/Web/Presenters/MessengerPresenter.php index e04e1adc..cec99cff 100644 --- a/Web/Presenters/MessengerPresenter.php +++ b/Web/Presenters/MessengerPresenter.php @@ -63,6 +63,7 @@ final class MessengerPresenter extends OpenVKPresenter $this->flash("err", tr("warning"), tr("user_may_not_reply")); } + $this->template->disable_ajax = 1; $this->template->selId = $sel; $this->template->correspondent = $correspondent; } diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 5406bf8a..b7d84b96 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -30,6 +30,10 @@ {script "js/node_modules/@popperjs/core/dist/umd/popper.min.js"} {script "js/node_modules/tippy.js/dist/tippy-bundle.umd.min.js"} {script "js/node_modules/handlebars/dist/handlebars.min.js"} + {script "js/node_modules/react/dist/react-with-addons.min.js"} + {script "js/node_modules/react-dom/dist/react-dom.min.js"} + {script "js/vnd_literallycanvas.js"} + {css "js/node_modules/literallycanvas/lib/css/literallycanvas.css"} {if $isTimezoned == NULL} {script "js/timezone.js"} @@ -393,6 +397,7 @@ {script "js/al_comments.js"} {script "js/al_music.js"} {script "js/al_despacito_wall.js"} + {script "js/al_photos.js"} {ifset $thisUser} {script "js/al_notifs.js"} diff --git a/Web/Presenters/templates/Apps/Edit.xml b/Web/Presenters/templates/Apps/Edit.xml index b8d9c8b0..8ae61396 100644 --- a/Web/Presenters/templates/Apps/Edit.xml +++ b/Web/Presenters/templates/Apps/Edit.xml @@ -101,12 +101,6 @@ {/block} diff --git a/Web/Presenters/templates/Apps/Play.xml b/Web/Presenters/templates/Apps/Play.xml index 32e50f26..53aabc8c 100644 --- a/Web/Presenters/templates/Apps/Play.xml +++ b/Web/Presenters/templates/Apps/Play.xml @@ -7,7 +7,7 @@ {block header} {$name} - {_report} + {_report} {/block} {block content} @@ -36,29 +36,5 @@ window.appOrigin = {$origin}; - - {script "js/al_games.js"} {/block} diff --git a/Web/Presenters/templates/Audio/tabs.xml b/Web/Presenters/templates/Audio/tabs.xml index 8252678e..8ff7bb1b 100644 --- a/Web/Presenters/templates/Audio/tabs.xml +++ b/Web/Presenters/templates/Audio/tabs.xml @@ -13,7 +13,7 @@ {_new_playlist} - {if !$isMy && $mode !== 'popular' && $mode !== 'new'} + {if !$isMy && $mode !== 'popular' && $mode !== 'new' && $mode != 'alone_audio'}