From 807ea755e0bddb814f5c55bdfa5321ce144fe816 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
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 <alexandre@alapetite.fr>
---
 app/views/helpers/feed/update.phtml     | 13 ++++++++++++-
 app/views/helpers/javascript_vars.phtml |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 4c117bdea..da4e04e50 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -1,5 +1,5 @@
 <?php /** @var FreshRSS_View $this */ ?>
-<div class="post">
+<div class="post" id="feed_update">
 	<h1><?= $this->feed->name() ?></h1>
 
 	<div>
@@ -591,3 +591,14 @@
 		</div>
 	</form>
 </div>
+
+<div id="popup">
+	<div id="popup-content">
+		<div id="popup-close" class="popup-row">×</div>
+		<div id="popup-iframe-container" class="popup-row">
+			<div id="popup-iframe-sub">
+				<iframe id="popup-iframe" frameborder="0"></iframe>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 5d78890f3..99437c7a6 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -22,6 +22,10 @@ echo htmlspecialchars(json_encode(array(
 		'auth_type' => FreshRSS_Context::$system_conf->auth_type,
 		'current_view' => Minz_Request::actionName(),
 		'csrf' => FreshRSS_Auth::csrfToken(),
+		'mtime' => [
+			'extra.js' => @filemtime(PUBLIC_PATH . '/scripts/extra.js'),
+			'feed.js' => @filemtime(PUBLIC_PATH . '/scripts/feed.js'),
+		],
 	),
 	'shortcuts' => array(
 		'actualize' => @$s['actualize'],
-- 
cgit v1.2.3