From 807ea755e0bddb814f5c55bdfa5321ce144fe816 Mon Sep 17 00:00:00 2001 From: maTh Date: Sun, 15 May 2022 21:52:52 +0200 Subject: fix preview (#4291) * fix * Update extra.js * reorga the scripts * Update extra.js * Several fixes https://github.com/FreshRSS/FreshRSS/pull/4291#issuecomment-1125472321 * More fixes * Cleaning * fix pr 4291 * Reorganise some script functions * Remove unused popup-txt And associated function openPopupWithMessage * Fix archiving categories https://github.com/FreshRSS/FreshRSS/pull/4291#issuecomment-1126924602 * Fix stats https://github.com/FreshRSS/FreshRSS/pull/4291#issuecomment-1126983134 * Fix direct subscription E.g. http://localhost/i/?c=subscription&id=735 * Fix subscription add https://github.com/FreshRSS/FreshRSS/pull/4291#issuecomment-1126991621 Co-authored-by: Alexandre Alapetite --- app/Controllers/subscriptionController.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/Controllers/subscriptionController.php') diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 60a433f50..1994a2164 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -45,6 +45,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { */ public function indexAction() { FreshRSS_View::appendScript(Minz_Url::display('/scripts/category.js?' . @filemtime(PUBLIC_PATH . '/scripts/category.js'))); + FreshRSS_View::appendScript(Minz_Url::display('/scripts/feed.js?' . @filemtime(PUBLIC_PATH . '/scripts/feed.js'))); FreshRSS_View::prependTitle(_t('sub.title') . ' ยท '); $this->view->onlyFeedsWithError = Minz_Request::paramTernary('error'); @@ -90,6 +91,8 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { public function feedAction() { if (Minz_Request::param('ajax')) { $this->view->_layout(false); + } else { + FreshRSS_View::appendScript(Minz_Url::display('/scripts/feed.js?' . @filemtime(PUBLIC_PATH . '/scripts/feed.js'))); } $feedDAO = FreshRSS_Factory::createFeedDao(); @@ -323,6 +326,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { * This action displays the page to add a new feed */ public function addAction() { + FreshRSS_View::appendScript(Minz_Url::display('/scripts/feed.js?' . @filemtime(PUBLIC_PATH . '/scripts/feed.js'))); FreshRSS_View::prependTitle(_t('sub.title.add') . ' . '); } } -- cgit v1.2.3