aboutsummaryrefslogtreecommitdiff
path: root/app/views/helpers/javascript_vars.phtml
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-15 03:30:24 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-15 03:30:24 +0100
commit878e96202e8a22e4857b98e29b0a1fce68eccbc9 (patch)
treef9233c3b48a0cd6e0ac2536ddcc1897201595ad4 /app/views/helpers/javascript_vars.phtml
parent4af233e1f736eb2256e5e1696418635165467855 (diff)
Grosse refactorisation pour permettre le chargement automatique des classes
C'est parti de changements pour https://github.com/marienfressinaud/FreshRSS/issues/255 et finalement j'ai continué la refactorisation... Ajout de préfixes FreshRSS_ et Minz_ sur le modèle de SimplePie_. Toutes les classes sont maintenant en chargement automatique (devrait améliorer les performances en évitant de charger plein de classes inutilisées, et faciliter la maintenance). Suppression de set_include_path(). Si souhaité, certaines classes de Minz pourraient être déplacées dans un sous-répertoire, par exemple les exceptions. Tests et relecture nécessaires.
Diffstat (limited to 'app/views/helpers/javascript_vars.phtml')
-rw-r--r--app/views/helpers/javascript_vars.phtml20
1 files changed, 10 insertions, 10 deletions
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index d6c2550f5..0c1af45fc 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -2,12 +2,12 @@
echo '"use strict";', "\n";
$mark = $this->conf->markWhen ();
echo 'var ',
- 'hide_posts=', ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader') ? 'false' : 'true',
+ 'hide_posts=', ($this->conf->displayPosts () === 'yes' || Minz_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',
+ ',full_lazyload=', $this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Minz_Request::param ('output') === 'reader') ? 'true' : 'false',
',does_lazyload=', $this->conf->lazyload() === 'yes' ? 'true' : 'false';
$s = $this->conf->shortcuts ();
@@ -21,11 +21,11 @@
'load_more:"', $s['load_more'], '"',
"},\n";
- if (Request::param ('output') === 'global') {
- echo "iconClose='", RSSThemes::icon('close'), "',\n";
+ if (Minz_Request::param ('output') === 'global') {
+ echo "iconClose='", FreshRSS_Themes::icon('close'), "',\n";
}
- $mail = Session::param ('mail', 'null');
+ $mail = Minz_Session::param ('mail', 'null');
if ($mail != 'null') {
$mail = '"' . $mail . '"';
}
@@ -35,11 +35,11 @@
'url_logout="', _url ('index', 'logout'), '",',
'current_user_mail=', $mail, ",\n";
- echo 'load_shortcuts=', Request::controllerName () === 'index' && Request::actionName () === 'index' ? 'true' : 'false', ",\n";
+ echo 'load_shortcuts=', Minz_Request::controllerName () === 'index' && Minz_Request::actionName () === 'index' ? 'true' : 'false', ",\n";
- echo 'str_confirmation="', Translate::t('confirm_action'), '"', ",\n";
+ echo 'str_confirmation="', Minz_Translate::t('confirm_action'), '"', ",\n";
- echo 'auto_actualize_feeds=', Session::param('actualize_feeds', false) ? 'true' : 'false', ";\n";
- if (Session::param('actualize_feeds', false)) {
- Session::_param('actualize_feeds');
+ echo 'auto_actualize_feeds=', Minz_Session::param('actualize_feeds', false) ? 'true' : 'false', ";\n";
+ if (Minz_Session::param('actualize_feeds', false)) {
+ Minz_Session::_param('actualize_feeds');
}