Selaa lähdekoodia

Corrige bug chargement JS

Lorsque la vue par défaut était le mode lecture, le JS ne se chargeait
pas. La faute au script LazyLoad qui n'était pas chargé correctement
Marien Fressinaud 12 vuotta sitten
vanhempi
commit
8c8e5257d8
2 muutettua tiedostoa jossa 9 lisäystä ja 6 poistoa
  1. 9 1
      app/App_FrontController.php
  2. 0 5
      app/controllers/indexController.php

+ 9 - 1
app/App_FrontController.php

@@ -43,6 +43,12 @@ class App_FrontController extends FrontController {
 		$this->conf = Session::param ('conf', new RSSConfiguration ());
 		View::_param ('conf', $this->conf);
 		Session::_param ('language', $this->conf->language ());
+
+		$output = Request::param ('output');
+		if(!$output) {
+			$output = $this->conf->viewMode();
+			Request::_param ('output', $output);
+		}
 	}
 
 	private function loadStylesAndScripts () {
@@ -53,11 +59,13 @@ class App_FrontController extends FrontController {
 			}
 		}
 		View::appendStyle (Url::display ('/themes/printer/style.css?' . @filemtime(PUBLIC_PATH . '/themes/printer/style.css')), 'print');
+
 		if (login_is_conf ($this->conf)) {
 			View::appendScript ('https://login.persona.org/include.js');
 		}
 		View::appendScript (Url::display ('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js')));
-		if ($this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader')) {
+		if ($this->conf->lazyload () === 'yes' &&
+				($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader')) {
 			View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.lazyload.min.js')));
 		}
 		View::appendScript (Url::display ('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));

+ 0 - 5
app/controllers/indexController.php

@@ -43,11 +43,6 @@ class indexController extends ActionController {
 			$this->view->_useLayout (false);
 			header('Content-Type: application/rss+xml; charset=utf-8');
 		} else {
-			if(!$output) {
-				$output = $this->view->conf->viewMode();
-				Request::_param ('output', $output);
-			}
-
 			View::appendScript (Url::display ('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js')));
 
 			if ($output == 'global') {