diff options
| author | Zakaria BOUZIANE | 2014-10-30 13:00:30 +0100 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2014-10-30 13:00:30 +0100 |
| commit | 539ecfb200efeff1a1ae8aa1c570bcc84857a17b (patch) | |
| tree | 112ce6780f5badcd2529ddc8b068b5e97ae112e2 /app/assets/javascripts/plugins | |
| parent | 5a82092ebbe7ae96f70d69d99e5bc876f802824c (diff) | |
| parent | a17cc730ea6d10a705e04fdfffb6279bfe541cfb (diff) | |
| download | chouette-core-539ecfb200efeff1a1ae8aa1c570bcc84857a17b.tar.bz2 | |
Merge branch 'sismo' of https://github.com/afimb/chouette2 into sismo
Diffstat (limited to 'app/assets/javascripts/plugins')
| -rw-r--r-- | app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee index 9945022bc..1c40ebdb5 100644 --- a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee +++ b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee @@ -1,16 +1,11 @@ jQuery -> if(!(Modernizr.inputtypes && Modernizr.inputtypes.time)) - $('.timepicker_basic').timepicker( - template: false, - showInputs: false, - minuteStep: 1, - showMeridian: false, - ) - $('.timepicker_seconds').timepicker( - template: false, - showInputs: false, - minuteStep: 1, - secondStep: 1, - showMeridian: false, - showSeconds: true - )
\ No newline at end of file + $('.timepicker_basic').datetimepicker({ + pickDate: false, + language: $(".dropdown.languages > a > img").attr("data-locale") || 'en', + }) + $('.timepicker_seconds').datetimepicker({ + pickDate: false, + language: $(".dropdown.languages > a > img").attr("data-locale") || 'en', + useSeconds: true, + })
\ No newline at end of file |