diff options
| author | Marc Florisson | 2014-05-22 14:00:32 +0200 |
|---|---|---|
| committer | Marc Florisson | 2014-05-22 14:00:32 +0200 |
| commit | 21b05c1fd97c4b204dce4bc9268823604db3eabc (patch) | |
| tree | d381b7e377b18088efc9e649fb806d9a2650fe63 /app/assets/javascripts | |
| parent | f3dc45b3f62e55cf1d060ab67c2fdaea6443b13c (diff) | |
| parent | 02d82ddb60ed40b380800b9a04f907c582c5e42f (diff) | |
| download | chouette-core-21b05c1fd97c4b204dce4bc9268823604db3eabc.tar.bz2 | |
Merge branch 'master' into fix_stop_point_on_route
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/plugins/jquery.ui.datepicker-i18n.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/time_tables.js.coffee | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/plugins/jquery.ui.datepicker-i18n.js b/app/assets/javascripts/plugins/jquery.ui.datepicker-i18n.js index b7748a77a..ef2bfb631 100644 --- a/app/assets/javascripts/plugins/jquery.ui.datepicker-i18n.js +++ b/app/assets/javascripts/plugins/jquery.ui.datepicker-i18n.js @@ -47,7 +47,7 @@ jQuery(function($){ { $(element).datepicker( { - dateFormat: "dd/mm/y", + dateFormat: "dd/mm/yy", dayNamesShort: $.datepicker.regional[ $('html').attr('lang') ].dayNamesShort, dayNames: $.datepicker.regional[ $('html').attr('lang') ].dayNames, monthNamesShort: $.datepicker.regional[ $('html').attr('lang') ].monthNamesShort, @@ -55,7 +55,7 @@ jQuery(function($){ } ); if ($(element).val().indexOf('/') >= 0) { - $(element).datepicker("setDate", $.datepicker.parseDate('dd/mm/y', $(element).val() ) ); + $(element).datepicker("setDate", $.datepicker.parseDate('dd/mm/yy', $(element).val() ) ); } else { @@ -68,7 +68,7 @@ jQuery(function($){ $this.find("input[type='date']").each( function(index, element) { - var date = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate('dd/mm/y', $(element).val() ) ); + var date = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate('dd/mm/yy', $(element).val() ) ); $(element).val(date); } ); diff --git a/app/assets/javascripts/time_tables.js.coffee b/app/assets/javascripts/time_tables.js.coffee index d347ddc67..c74811632 100644 --- a/app/assets/javascripts/time_tables.js.coffee +++ b/app/assets/javascripts/time_tables.js.coffee @@ -42,5 +42,7 @@ jQuery -> $('#periods_content').bind('insertion-callback',after_inserts) $('#dates_content').bind('insertion-callback',after_inserts) #after_inserts() + + $(document).on('cocoon:after-insert',after_inserts) $(document).ready(bind_after_inserts) if $('.time_tables').length > 0 |