From 4ec753d2cb56f519d0931896b4e2ce3ebb45c6bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Tue, 7 Apr 2015 10:30:59 +0200
Subject: [PATCH] =?utf8?q?%::myconfig=20dem=20Client=20javascript=20zur=20?=
 =?utf8?q?Verf=C3=BCgung=20stellen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 templates/webpages/layout/javascript_setup.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/webpages/layout/javascript_setup.js b/templates/webpages/layout/javascript_setup.js
index 40424452b..79cc654ac 100644
--- a/templates/webpages/layout/javascript_setup.js
+++ b/templates/webpages/layout/javascript_setup.js
@@ -1,13 +1,14 @@
 [%- USE T8 %]
 [%- USE JavaScript %]
+[%- USE JSON %]
+kivi.myconfig = [% JSON.json(MYCONFIG) %];
 $(function() {
-[% IF datefmt %]
-  setupPoints('[% JavaScript.escape(MYCONFIG.numberformat) %]', '[% 'wrongformat' | $T8 %]');
-  setupDateFormat('[% JavaScript.escape(MYCONFIG.dateformat) %]', '[% 'Falsches Datumsformat!' | $T8 %]');
+  setupPoints(kivi.myconfig.numberformat, '[% 'wrongformat' | $T8 %]');
+  setupDateFormat(kivi.myconfig.dateformat, '[% 'Falsches Datumsformat!' | $T8 %]');
 
   $.datepicker.setDefaults(
-    $.extend({}, $.datepicker.regional['[% JavaScript.escape(MYCONFIG.countrycode) %]'], {
-      dateFormat: '[% JavaScript.escape(datefmt) %]',
+    $.extend({}, $.datepicker.regional[kivi.myconfig.countrycode], {
+      dateFormat: kivi.myconfig.dateformat.replace(/d+/gi, 'dd').replace(/m+/gi, 'mm').replace(/y+/gi, 'yy'),
       showOn: "button",
       showButtonPanel: true,
       changeMonth: true,
@@ -17,14 +18,13 @@ $(function() {
   }));
 
   kivi.setup_formats({
-    numbers: '[% JavaScript.escape(MYCONFIG.numberformat) %]',
-    dates:   '[% JavaScript.escape(MYCONFIG.dateformat) %]'
+    numbers: kivi.myconfig.numberformat,
+    dates:   kivi.myconfig.dateformat
   });
 
   kivi.reinit_widgets();
-[% END %]
 
-[% IF ajax_spinner %]
+[%- IF ajax_spinner %]
   $(document).ajaxSend(function() {
     $('#ajax-spinner').show();
   }).ajaxStop(function() {
-- 
2.20.1