diff options
| author | Michel Etienne | 2014-11-04 16:54:57 +0100 |
|---|---|---|
| committer | Michel Etienne | 2014-11-04 16:54:57 +0100 |
| commit | 9fb6ada72866e3fce55fc81057f6c179a11134fd (patch) | |
| tree | 873ecea902e1ace619ce872ba90f2c876e3251d4 /app/assets/javascripts/plugins | |
| parent | c828656898b1bc728e6fa89c4d527fd009dc7777 (diff) | |
| parent | 2b86d2428d5da8be4499fc1fec2976f6c70fa34e (diff) | |
| download | chouette-core-9fb6ada72866e3fce55fc81057f6c179a11134fd.tar.bz2 | |
Merge branch 'sismo' into V2_5
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 |