diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-09 01:22:51 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-09 01:22:51 +0100 |
| commit | 1de8218182a7126d4b44c4a5f35d1eaf7ef4bb71 (patch) | |
| tree | ede95a35a19b0950ec12624e8b59d962064838ee | |
| parent | 1c2143c0794b6d14484a71e1025234356087117c (diff) | |
Déplacement de confirm_action_script
Ce script a été intégré à main.js pour être certain que JQuery est
chargé au moment de l'initialisation
Voir commentaires commit c06aede546514aa35ab5369575f15710b30a2a23
| -rw-r--r-- | app/views/configure/categorize.phtml | 2 | ||||
| -rw-r--r-- | app/views/configure/feed.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/confirm_action_script.phtml | 5 | ||||
| -rw-r--r-- | app/views/helpers/javascript_vars.phtml | 6 | ||||
| -rw-r--r-- | public/scripts/main.js | 7 |
5 files changed, 11 insertions, 11 deletions
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml index 0403f0120..95951247e 100644 --- a/app/views/configure/categorize.phtml +++ b/app/views/configure/categorize.phtml @@ -45,5 +45,3 @@ </div> </form> </div> - -<?php $this->renderHelper ('confirm_action_script'); ?> diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index e570ea410..b61de6dcb 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -111,8 +111,6 @@ </form> </div> -<?php $this->renderHelper ('confirm_action_script'); ?> - <?php } else { ?> <div class="alert alert-warn"><span class="alert-head"><?php echo Translate::t ('no_selected_feed'); ?></span> <?php echo Translate::t ('think_to_add'); ?></div> <?php } ?> diff --git a/app/views/helpers/confirm_action_script.phtml b/app/views/helpers/confirm_action_script.phtml deleted file mode 100644 index f77006fcc..000000000 --- a/app/views/helpers/confirm_action_script.phtml +++ /dev/null @@ -1,5 +0,0 @@ -<script type="text/javascript"> - $('.confirm').click(function () { - return confirm("<?php echo Translate::t('confirm_action'); ?>"); - }); -</script>
\ No newline at end of file diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index df552527f..101c2e001 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -17,7 +17,7 @@ 'go_website:"', $s['go_website'], '",', 'prev_entry:"', $s['prev_entry'], '",', 'next_entry:"', $s['next_entry'], '"', - "},"; + "},\n"; $mail = Session::param ('mail', 'null'); if ($mail != 'null') { @@ -29,4 +29,6 @@ '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=', Request::controllerName () === 'index' && Request::actionName () === 'index' ? 'true' : 'false', ",\n"; + + echo 'str_confirmation="', Translate::t('confirm_action'), '"', ";\n"; diff --git a/public/scripts/main.js b/public/scripts/main.js index 9723e617d..9c7021ba6 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -583,6 +583,12 @@ function init_persona() { } //</persona> +function init_confirm_action() { + $('.confirm').click(function () { + return confirm(str_confirmation); + }); +} + function init_all() { if (!(window.$ && window.url_freshrss && ((!full_lazyload) || $.fn.lazyload))) { if (window.console) { @@ -606,6 +612,7 @@ function init_all() { if (use_persona) { init_persona(); } + init_confirm_action(); if (window.console) { console.log('FreshRSS init done.'); } |