aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-08 19:21:42 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-08 19:21:42 +0100
commit7de22cdf4c08a407f3f550942dd0fa44cfaaf317 (patch)
treed9670639737a9fcac70602d0572bc460e82db17c
parent365bacd90a81eb5b9e95344fa06fd5093b1e8066 (diff)
Déplace chargement fichier main.js
Le chargement de main.js était fait dans indexController. Il est fait maintenant dans le FrontController pour avoir accès, même hors de la page principale, aux fonctionnalités de connexion / déconnexion / fermeture des notifications
-rw-r--r--app/App_FrontController.php1
-rwxr-xr-xapp/controllers/indexController.php1
2 files changed, 1 insertions, 1 deletions
diff --git a/app/App_FrontController.php b/app/App_FrontController.php
index 91eb7fa3c..02b379bca 100644
--- a/app/App_FrontController.php
+++ b/app/App_FrontController.php
@@ -65,6 +65,7 @@ class App_FrontController extends FrontController {
if ($this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader')) {
View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js'));
}
+ View::appendScript (Url::display ('/scripts/main.js'));
}
private function loadNotifications () {
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index 98fb4e903..aa67eb6d3 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -17,7 +17,6 @@ class indexController extends ActionController {
}
View::appendScript (Url::display ('/scripts/shortcut.js'));
- View::appendScript (Url::display ('/scripts/main.js'));
if ($output == 'global') {
View::appendScript (Url::display ('/scripts/global_view.js'));