diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-08 23:15:29 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-08 23:15:29 +0100 |
| commit | d4f636f26ab8642e8c357e75f71868bd73751d23 (patch) | |
| tree | f168a562b02aaf4783b577d95dca4f8a3087115b | |
| parent | 2d330e43f23ba8d600e9fd20b8f5799fb4afb8ab (diff) | |
Ne charge les raccourcis que sur la page principale
| -rw-r--r-- | app/views/javascript/main.phtml | 8 | ||||
| -rw-r--r-- | public/scripts/main.js | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml index cdf8475bd..df552527f 100644 --- a/app/views/javascript/main.phtml +++ b/app/views/javascript/main.phtml @@ -17,14 +17,16 @@ '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', + 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"; + 'current_user_mail=', $mail, ",\n"; + + echo 'load_shortcuts=', Request::controllerName () === 'index' && Request::actionName () === 'index' ? 'true' : 'false', ";\n"; diff --git a/public/scripts/main.js b/public/scripts/main.js index 40c802ae7..3d4c1f30a 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -591,7 +591,9 @@ function init_all() { $stream = $('#stream'); init_posts(); init_column_categories(); - init_shortcuts(); + if (load_shortcuts) { + init_shortcuts(); + } init_stream_delegates($stream); init_nav_entries(); init_templates(); |