aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts/plugins
diff options
context:
space:
mode:
authorMichel Etienne2014-08-20 13:35:50 +0200
committerMichel Etienne2014-08-20 13:35:50 +0200
commit4e787048ecdda31c129dcada8385e74124795b82 (patch)
tree3047ddc9087dcaf1d72deb0b7f1e111c6c7cd29d /app/assets/javascripts/plugins
parent44690f334906c6c818aa8443bf46d6e4f33de832 (diff)
parentb6d1c06128a67878ca5430dff005eaabb026307b (diff)
downloadchouette-core-4e787048ecdda31c129dcada8385e74124795b82.tar.bz2
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/assets/javascripts/plugins')
-rw-r--r--app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee
index bfa7c5587..9945022bc 100644
--- a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee
+++ b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee
@@ -1,8 +1,16 @@
jQuery ->
if(!(Modernizr.inputtypes && Modernizr.inputtypes.time))
- $('input[type="time"]').timepicker(
+ $('.timepicker_basic').timepicker(
template: false,
showInputs: false,
minuteStep: 1,
showMeridian: false,
- ) \ No newline at end of file
+ )
+ $('.timepicker_seconds').timepicker(
+ template: false,
+ showInputs: false,
+ minuteStep: 1,
+ secondStep: 1,
+ showMeridian: false,
+ showSeconds: true
+ ) \ No newline at end of file