From 1de8218182a7126d4b44c4a5f35d1eaf7ef4bb71 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 9 Nov 2013 01:22:51 +0100
Subject: Déplacement de confirm_action_script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ce script a été intégré à main.js pour être certain que JQuery est
chargé au moment de l'initialisation

Voir commentaires commit c06aede546514aa35ab5369575f15710b30a2a23
---
 app/views/configure/categorize.phtml          | 2 --
 app/views/configure/feed.phtml                | 2 --
 app/views/helpers/confirm_action_script.phtml | 5 -----
 app/views/helpers/javascript_vars.phtml       | 6 ++++--
 4 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 app/views/helpers/confirm_action_script.phtml

(limited to 'app')

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";
-- 
cgit v1.2.3