Déplace le fichier main.phtml

app/views/javascript/main.phtml est déplacé vers
app/views/helpers/javascript_vars.phtml

Il reste à déplacer le fichier actualize.phtml pour se débarrasser de
javascriptController

1 files changed, 32 insertions, 0 deletions

diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
new file mode 100644
index 000000000..df552527f
--- /dev/null
+++ b/app/views/helpers/javascript_vars.phtml
@@ -0,0 +1,32 @@
+<?php
+	echo '"use strict";', "\n";
+	$mark = $this->conf->markWhen ();
+	echo 'var ',
+		'hide_posts=', ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader') ? 'false' : 'true',
+		',auto_mark_article=', $mark['article'] === 'yes' ? 'true' : 'false',
+		',auto_mark_site=', $mark['site'] === 'yes' ? 'true' : 'false',
+		',auto_mark_scroll=', $mark['scroll'] === 'yes' ? 'true' : 'false',
+		',auto_load_more=', $this->conf->autoLoadMore () === 'yes' ? 'true' : 'false',
+		',full_lazyload=', $this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader') ? 'true' : 'false',
+		',does_lazyload=', $this->conf->lazyload() === 'yes' ? 'true' : 'false';
+
+	$s = $this->conf->shortcuts ();
+	echo ',shortcuts={',
+			'mark_read:"', $s['mark_read'], '",',
+			'mark_favorite:"', $s['mark_favorite'], '",',
+			'go_website:"', $s['go_website'], '",',
+			'prev_entry:"', $s['prev_entry'], '",',
+			'next_entry:"', $s['next_entry'], '"',
+		"},";
+
+	$mail = Session::param ('mail', 'null');
+	if ($mail != 'null') {
+		$mail = '"' . $mail . '"';
+	}
+	echo 'use_persona=', login_is_conf ($this->conf) ? 'true' : 'false',
+		',url_freshrss="', _url ('index', 'index'), '",',
+		'url_login="', _url ('index', 'login'), '",',
+		'url_logout="', _url ('index', 'logout'), '",',
+		'current_user_mail=', $mail, ",\n";
+
+	echo 'load_shortcuts=', Request::controllerName () === 'index' && Request::actionName () === 'index' ? 'true' : 'false', ";\n";