diff options
Diffstat (limited to 'src')
47 files changed, 142 insertions, 22 deletions
diff --git a/src/.jshintrc b/src/.jshintrc index d3d850f..a624e4c 100644 --- a/src/.jshintrc +++ b/src/.jshintrc @@ -13,5 +13,5 @@ "boss": true, "eqnull": true, "browser": true, - "predef": ["jQuery"] + "predef": ["jQuery","define"] } diff --git a/src/docs/examples.html b/src/docs/examples.html index 4765039..a04af2f 100644 --- a/src/docs/examples.html +++ b/src/docs/examples.html @@ -182,6 +182,20 @@ $('#slider_example_4').datetimepicker({ <!-- ============= example --> <div class="example-container"> + <p>Uses one line dropdowns instead of sliders.</p> + <div> + <input type="text" name="slider_example_4andHalf" id="slider_example_4andHalf" value="" /> + </div> +<pre> +$('#slider_example_4andHalf').datetimepicker({ + controlType: 'select', + oneLine: true, + timeFormat: 'hh:mm tt' +});</pre> + </div> + + <!-- ============= example --> + <div class="example-container"> <p>Create your own control by implementing the create, options, and value methods. If you want to use your new control for all instances use the $.timepicker.setDefaults({controlType:myControl}). Here we implement jQueryUI's spinner control (jQueryUI 1.9+).</p> <div> <input type="text" name="slider_example_5" id="slider_example_5" value="" /> diff --git a/src/docs/footer.html b/src/docs/footer.html index 5f1c5ad..919cf65 100644 --- a/src/docs/footer.html +++ b/src/docs/footer.html @@ -23,15 +23,16 @@ </script> <script type="text/javascript" src="https://sellfy.com/js/api_buttons.js"></script> - - <script type="text/javascript"> /* + <!-- + <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); - */</script> - <script type="text/javascript"> /* + </script> + <script type="text/javascript"> try { var pageTracker = _gat._getTracker("UA-7602218-1"); pageTracker._trackPageview(); - } catch(err) {}*/</script> + } catch(err) {}</script> + --> </body> </html>
\ No newline at end of file diff --git a/src/docs/options.html b/src/docs/options.html index 22fc123..0754fb0 100644 --- a/src/docs/options.html +++ b/src/docs/options.html @@ -209,6 +209,9 @@ <dt>timeOnlyShowDate</dt> <dd><em>Default: false</em> - Show the date and time in the input, but only allow the timepicker.</dd> + <dt>afterInject</dt> + <dd><em>Default: null</em> - Function to be called when the timepicker or selection control is injected or re-rendered. Called in the context of the timepicker instance.</dd> + <dt>onSelect</dt> <dd><em>Default: null</em> - Function to be called when a date is chosen or time has changed (parameters: datetimeText, datepickerInstance).</dd> @@ -227,6 +230,9 @@ <dt>showTimepicker</dt> <dd><em>Default: true</em> - Whether to show the timepicker within the datepicker.</dd> + <dt>oneLine</dt> + <dd><em>Default: false</em> - Try to show the time dropdowns all on one line. This should be used with controlType 'select' and as few units as possible.</dd> + <dt>addSliderAccess</dt> <dd><em>Default: false</em> - Adds the <a href="http://trentrichardson.com/examples/jQuery-SliderAccess/" title="jQueryUI Slider Access Plugin">sliderAccess plugin</a> to sliders within timepicker</dd> diff --git a/src/i18n/jquery-ui-timepicker-af.js b/src/i18n/jquery-ui-timepicker-af.js index fe9f8c5..8dbec3e 100644 --- a/src/i18n/jquery-ui-timepicker-af.js +++ b/src/i18n/jquery-ui-timepicker-af.js @@ -13,6 +13,7 @@ currentText: 'Huidige Tyd',
closeText: 'Klaar',
timeFormat: 'HH:mm',
+ timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
diff --git a/src/i18n/jquery-ui-timepicker-am.js b/src/i18n/jquery-ui-timepicker-am.js index 69cce8a..676c8b9 100644 --- a/src/i18n/jquery-ui-timepicker-am.js +++ b/src/i18n/jquery-ui-timepicker-am.js @@ -13,6 +13,7 @@ currentText: 'Այժմ', closeText: 'Փակել', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-bg.js b/src/i18n/jquery-ui-timepicker-bg.js index 1efb439..58f076e 100644 --- a/src/i18n/jquery-ui-timepicker-bg.js +++ b/src/i18n/jquery-ui-timepicker-bg.js @@ -13,6 +13,7 @@ currentText: 'Сега', closeText: 'Затвори', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-ca.js b/src/i18n/jquery-ui-timepicker-ca.js index 25b4eed..84fa00e 100644 --- a/src/i18n/jquery-ui-timepicker-ca.js +++ b/src/i18n/jquery-ui-timepicker-ca.js @@ -13,6 +13,7 @@ currentText: 'Ara', closeText: 'Tancar', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-cs.js b/src/i18n/jquery-ui-timepicker-cs.js index 9d358fa..26d6ec7 100644 --- a/src/i18n/jquery-ui-timepicker-cs.js +++ b/src/i18n/jquery-ui-timepicker-cs.js @@ -13,6 +13,7 @@ currentText: 'Nyní', closeText: 'Zavřít', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['dop.', 'AM', 'A'], pmNames: ['odp.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-da.js b/src/i18n/jquery-ui-timepicker-da.js index 7afb189..5d8072b 100644 --- a/src/i18n/jquery-ui-timepicker-da.js +++ b/src/i18n/jquery-ui-timepicker-da.js @@ -13,6 +13,7 @@ currentText: 'Nu', closeText: 'Luk', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['am', 'AM', 'A'], pmNames: ['pm', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-de.js b/src/i18n/jquery-ui-timepicker-de.js index a0ddf9f..90c33af 100644 --- a/src/i18n/jquery-ui-timepicker-de.js +++ b/src/i18n/jquery-ui-timepicker-de.js @@ -13,6 +13,7 @@ currentText: 'Jetzt', closeText: 'Fertig', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['vorm.', 'AM', 'A'], pmNames: ['nachm.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-el.js b/src/i18n/jquery-ui-timepicker-el.js index 6b7e827..1fe9b0e 100644 --- a/src/i18n/jquery-ui-timepicker-el.js +++ b/src/i18n/jquery-ui-timepicker-el.js @@ -13,6 +13,7 @@ currentText: 'Τώρα', closeText: 'Κλείσιμο', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['π.μ.', 'AM', 'A'], pmNames: ['μ.μ.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-es.js b/src/i18n/jquery-ui-timepicker-es.js index 3e3b100..b19ba11 100644 --- a/src/i18n/jquery-ui-timepicker-es.js +++ b/src/i18n/jquery-ui-timepicker-es.js @@ -14,6 +14,7 @@ currentText: 'Hoy', closeText: 'Cerrar', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['a.m.', 'AM', 'A'], pmNames: ['p.m.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-et.js b/src/i18n/jquery-ui-timepicker-et.js index 2e64cc8..b2bb766 100644 --- a/src/i18n/jquery-ui-timepicker-et.js +++ b/src/i18n/jquery-ui-timepicker-et.js @@ -13,6 +13,7 @@ currentText: 'Praegu', closeText: 'Valmis', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-eu.js b/src/i18n/jquery-ui-timepicker-eu.js index 8884e4a..7e0c0f3 100644 --- a/src/i18n/jquery-ui-timepicker-eu.js +++ b/src/i18n/jquery-ui-timepicker-eu.js @@ -14,6 +14,7 @@ currentText: 'Orain', closeText: 'Itxi', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['a.m.', 'AM', 'A'], pmNames: ['p.m.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-fi.js b/src/i18n/jquery-ui-timepicker-fi.js index 3f1d95e..4493d4c 100644 --- a/src/i18n/jquery-ui-timepicker-fi.js +++ b/src/i18n/jquery-ui-timepicker-fi.js @@ -13,6 +13,7 @@ currentText: 'Nyt', closeText: 'Sulje', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['ap.', 'AM', 'A'], pmNames: ['ip.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-fr.js b/src/i18n/jquery-ui-timepicker-fr.js index a8a46fe..0002517 100644 --- a/src/i18n/jquery-ui-timepicker-fr.js +++ b/src/i18n/jquery-ui-timepicker-fr.js @@ -13,6 +13,7 @@ currentText: 'Maintenant', closeText: 'Terminé', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-gl.js b/src/i18n/jquery-ui-timepicker-gl.js index 900e377..4b9501f 100644 --- a/src/i18n/jquery-ui-timepicker-gl.js +++ b/src/i18n/jquery-ui-timepicker-gl.js @@ -13,6 +13,7 @@ currentText: 'Agora', closeText: 'Pechar', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['a.m.', 'AM', 'A'], pmNames: ['p.m.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-he.js b/src/i18n/jquery-ui-timepicker-he.js index eb71018..9b78cbd 100644 --- a/src/i18n/jquery-ui-timepicker-he.js +++ b/src/i18n/jquery-ui-timepicker-he.js @@ -13,6 +13,7 @@ currentText: "עכשיו", closeText:"סגור", timeFormat: "HH:mm", + timeSuffix: '', amNames: ['לפנה"צ', 'AM', 'A'], pmNames: ['אחה"צ', 'PM', 'P'], isRTL: true diff --git a/src/i18n/jquery-ui-timepicker-hr.js b/src/i18n/jquery-ui-timepicker-hr.js index c314b8e..b60f89a 100644 --- a/src/i18n/jquery-ui-timepicker-hr.js +++ b/src/i18n/jquery-ui-timepicker-hr.js @@ -13,6 +13,7 @@ currentText: 'Sada', closeText: 'Gotovo', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['a.m.', 'AM', 'A'], pmNames: ['p.m.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-hu.js b/src/i18n/jquery-ui-timepicker-hu.js index fd1f5e1..6bdb0f4 100644 --- a/src/i18n/jquery-ui-timepicker-hu.js +++ b/src/i18n/jquery-ui-timepicker-hu.js @@ -13,6 +13,7 @@ currentText: 'Most', closeText: 'Kész', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['de.', 'AM', 'A'], pmNames: ['du.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-id.js b/src/i18n/jquery-ui-timepicker-id.js index 50a976b..9f21f50 100644 --- a/src/i18n/jquery-ui-timepicker-id.js +++ b/src/i18n/jquery-ui-timepicker-id.js @@ -13,6 +13,7 @@ currentText: 'Sekarang', closeText: 'OK', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-it.js b/src/i18n/jquery-ui-timepicker-it.js index ea976fd..540f41a 100644 --- a/src/i18n/jquery-ui-timepicker-it.js +++ b/src/i18n/jquery-ui-timepicker-it.js @@ -13,6 +13,7 @@ currentText: 'Adesso', closeText: 'Chiudi', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['m.', 'AM', 'A'], pmNames: ['p.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-ja.js b/src/i18n/jquery-ui-timepicker-ja.js index 15c7b79..cd3f020 100644 --- a/src/i18n/jquery-ui-timepicker-ja.js +++ b/src/i18n/jquery-ui-timepicker-ja.js @@ -13,6 +13,7 @@ currentText: '現時刻', closeText: '閉じる', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['午前', 'AM', 'A'], pmNames: ['午後', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-ko.js b/src/i18n/jquery-ui-timepicker-ko.js index 0a41c5b..ca85b88 100644 --- a/src/i18n/jquery-ui-timepicker-ko.js +++ b/src/i18n/jquery-ui-timepicker-ko.js @@ -13,6 +13,7 @@ currentText: '현재 시각', closeText: '닫기', timeFormat: 'tt h:mm', + timeSuffix: '', amNames: ['오전', 'AM', 'A'], pmNames: ['오후', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-lt.js b/src/i18n/jquery-ui-timepicker-lt.js index eb7b3c7..97d2b8b 100644 --- a/src/i18n/jquery-ui-timepicker-lt.js +++ b/src/i18n/jquery-ui-timepicker-lt.js @@ -13,6 +13,7 @@ currentText: 'Dabar', closeText: 'Uždaryti', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['priešpiet', 'AM', 'A'], pmNames: ['popiet', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-lv.js b/src/i18n/jquery-ui-timepicker-lv.js new file mode 100644 index 0000000..0cbd6e6 --- /dev/null +++ b/src/i18n/jquery-ui-timepicker-lv.js @@ -0,0 +1,22 @@ +/* Latvian translation for the jQuery Timepicker Addon */ +/* Written by Dmitry Bogatykh */ +(function($) { + $.timepicker.regional['lv'] = { + timeOnlyTitle: 'Ievadiet laiku', + timeText: 'Laiks', + hourText: 'Stundas', + minuteText: 'Minūtes', + secondText: 'Sekundes', + millisecText: 'Milisekundes', + microsecText: 'Mikrosekundes', + timezoneText: 'Laika josla', + currentText: 'Tagad', + closeText: 'Aizvērt', + timeFormat: 'HH:mm', + timeSuffix: '', + amNames: ['AM', 'AM', 'A'], + pmNames: ['PM', 'PM', 'P'], + isRTL: false + }; + $.timepicker.setDefaults($.timepicker.regional['lv']); +})(jQuery);
\ No newline at end of file diff --git a/src/i18n/jquery-ui-timepicker-nl.js b/src/i18n/jquery-ui-timepicker-nl.js index 8189cc4..bc71fc1 100644 --- a/src/i18n/jquery-ui-timepicker-nl.js +++ b/src/i18n/jquery-ui-timepicker-nl.js @@ -13,6 +13,7 @@ currentText: 'Vandaag', closeText: 'Sluiten', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-no.js b/src/i18n/jquery-ui-timepicker-no.js index 1eeee6d..39f32fd 100644 --- a/src/i18n/jquery-ui-timepicker-no.js +++ b/src/i18n/jquery-ui-timepicker-no.js @@ -13,6 +13,7 @@ currentText: 'Nå', closeText: 'Lukk', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['am', 'AM', 'A'], pmNames: ['pm', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-pl.js b/src/i18n/jquery-ui-timepicker-pl.js index 5b7d4a9..0a67a79 100644 --- a/src/i18n/jquery-ui-timepicker-pl.js +++ b/src/i18n/jquery-ui-timepicker-pl.js @@ -13,6 +13,7 @@ currentText: 'Teraz', closeText: 'Gotowe', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-pt-BR.js b/src/i18n/jquery-ui-timepicker-pt-BR.js index 2c1b02f..0ad06a3 100644 --- a/src/i18n/jquery-ui-timepicker-pt-BR.js +++ b/src/i18n/jquery-ui-timepicker-pt-BR.js @@ -13,6 +13,7 @@ currentText: 'Agora', closeText: 'Fechar', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['a.m.', 'AM', 'A'], pmNames: ['p.m.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-pt.js b/src/i18n/jquery-ui-timepicker-pt.js index bc549e0..0aa792e 100644 --- a/src/i18n/jquery-ui-timepicker-pt.js +++ b/src/i18n/jquery-ui-timepicker-pt.js @@ -13,6 +13,7 @@ currentText: 'Agora', closeText: 'Fechar', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['a.m.', 'AM', 'A'], pmNames: ['p.m.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-ro.js b/src/i18n/jquery-ui-timepicker-ro.js index 01acce7..4f5f386 100644 --- a/src/i18n/jquery-ui-timepicker-ro.js +++ b/src/i18n/jquery-ui-timepicker-ro.js @@ -13,6 +13,7 @@ currentText: 'Acum', closeText: 'Închide', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-ru.js b/src/i18n/jquery-ui-timepicker-ru.js index d7169fa..b539a73 100644 --- a/src/i18n/jquery-ui-timepicker-ru.js +++ b/src/i18n/jquery-ui-timepicker-ru.js @@ -13,6 +13,7 @@ currentText: 'Сейчас', closeText: 'Закрыть', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-sk.js b/src/i18n/jquery-ui-timepicker-sk.js index 15700e0..eee0d0b 100644 --- a/src/i18n/jquery-ui-timepicker-sk.js +++ b/src/i18n/jquery-ui-timepicker-sk.js @@ -13,6 +13,7 @@ currentText: 'Teraz', closeText: 'Zavrieť', timeFormat: 'H:m', + timeSuffix: '', amNames: ['dop.', 'AM', 'A'], pmNames: ['pop.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-sl.js b/src/i18n/jquery-ui-timepicker-sl.js index b100fa3..0906b10 100644 --- a/src/i18n/jquery-ui-timepicker-sl.js +++ b/src/i18n/jquery-ui-timepicker-sl.js @@ -13,6 +13,7 @@ currentText: 'Sedaj', closeText: 'Zapri', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['dop.', 'AM', 'A'], pmNames: ['pop.', 'PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-sr-RS.js b/src/i18n/jquery-ui-timepicker-sr-RS.js index 1ee4aae..79a9803 100644 --- a/src/i18n/jquery-ui-timepicker-sr-RS.js +++ b/src/i18n/jquery-ui-timepicker-sr-RS.js @@ -13,6 +13,7 @@ currentText: 'Сада', closeText: 'Затвори', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-sr-YU.js b/src/i18n/jquery-ui-timepicker-sr-YU.js index cb99fb8..260881a 100644 --- a/src/i18n/jquery-ui-timepicker-sr-YU.js +++ b/src/i18n/jquery-ui-timepicker-sr-YU.js @@ -13,6 +13,7 @@ currentText: 'Sada', closeText: 'Zatvori', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-sv.js b/src/i18n/jquery-ui-timepicker-sv.js index 4540ac6..7bb0e7e 100644 --- a/src/i18n/jquery-ui-timepicker-sv.js +++ b/src/i18n/jquery-ui-timepicker-sv.js @@ -13,6 +13,7 @@ currentText: 'Nu', closeText: 'Stäng', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-th.js b/src/i18n/jquery-ui-timepicker-th.js index 7042e8c..4eb93a5 100644 --- a/src/i18n/jquery-ui-timepicker-th.js +++ b/src/i18n/jquery-ui-timepicker-th.js @@ -12,7 +12,8 @@ timezoneText: 'เขตเวลา', currentText: 'เวลาปัจจุบัน', closeText: 'ปิด', - timeFormat: 'hh:mm tt' + timeFormat: 'hh:mm tt', + timeSuffix: '' }; $.timepicker.setDefaults($.timepicker.regional['th']); })(jQuery);
\ No newline at end of file diff --git a/src/i18n/jquery-ui-timepicker-tr.js b/src/i18n/jquery-ui-timepicker-tr.js index 51f89d6..f426e70 100644 --- a/src/i18n/jquery-ui-timepicker-tr.js +++ b/src/i18n/jquery-ui-timepicker-tr.js @@ -13,6 +13,7 @@ currentText: 'Şu an', closeText: 'Tamam', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['ÖÖ', 'Ö'], pmNames: ['ÖS', 'S'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-uk.js b/src/i18n/jquery-ui-timepicker-uk.js index a239fe2..285c8ba 100644 --- a/src/i18n/jquery-ui-timepicker-uk.js +++ b/src/i18n/jquery-ui-timepicker-uk.js @@ -13,6 +13,7 @@ currentText: 'Зараз', closeText: 'Закрити', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-vi.js b/src/i18n/jquery-ui-timepicker-vi.js index 60d712a..59fddae 100644 --- a/src/i18n/jquery-ui-timepicker-vi.js +++ b/src/i18n/jquery-ui-timepicker-vi.js @@ -13,6 +13,7 @@ currentText: 'Hiện thời', closeText: 'Đóng', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['SA', 'S'], pmNames: ['CH', 'C'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-zh-CN.js b/src/i18n/jquery-ui-timepicker-zh-CN.js index e73ac3b..a5ca804 100644 --- a/src/i18n/jquery-ui-timepicker-zh-CN.js +++ b/src/i18n/jquery-ui-timepicker-zh-CN.js @@ -13,6 +13,7 @@ currentText: '现在时间', closeText: '关闭', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['AM', 'A'], pmNames: ['PM', 'P'], isRTL: false diff --git a/src/i18n/jquery-ui-timepicker-zh-TW.js b/src/i18n/jquery-ui-timepicker-zh-TW.js index 9cbeabf..762797b 100644 --- a/src/i18n/jquery-ui-timepicker-zh-TW.js +++ b/src/i18n/jquery-ui-timepicker-zh-TW.js @@ -13,6 +13,7 @@ currentText: '現在時間', closeText: '確定', timeFormat: 'HH:mm', + timeSuffix: '', amNames: ['上午', 'AM', 'A'], pmNames: ['下午', 'PM', 'P'], isRTL: false diff --git a/src/jquery-ui-timepicker-addon.css b/src/jquery-ui-timepicker-addon.css index da12d98..2d9e031 100644 --- a/src/jquery-ui-timepicker-addon.css +++ b/src/jquery-ui-timepicker-addon.css @@ -4,8 +4,24 @@ .ui-timepicker-div dl dd { margin: 0 10px 10px 40%; } .ui-timepicker-div td { font-size: 90%; } .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } +.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; } .ui-timepicker-rtl{ direction: rtl; } .ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; } .ui-timepicker-rtl dl dt{ float: right; clear: right; } -.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }
\ No newline at end of file +.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; } + +/* Shortened version style */ +.ui-timepicker-div.ui-timepicker-oneLine { padding-right: 2px; } +.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time, +.ui-timepicker-div.ui-timepicker-oneLine dt { display: none; } +.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label { display: block; padding-top: 2px; } +.ui-timepicker-div.ui-timepicker-oneLine dl { text-align: right; } +.ui-timepicker-div.ui-timepicker-oneLine dl dd, +.ui-timepicker-div.ui-timepicker-oneLine dl dd > div { display:inline-block; margin:0; } +.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before, +.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before { content:':'; display:inline-block; } +.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before, +.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before { content:'.'; display:inline-block; } +.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide, +.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{ display: none; }
\ No newline at end of file diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index 58d6653..5c26af5 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -7,7 +7,13 @@ * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt */ -(function ($) { +(function (factory) { + if (typeof define === 'function' && define.amd) { + define(['jquery', 'jquery.ui'], factory); + } else { + factory(jQuery); + } +}(function ($) { /* * Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded" @@ -107,8 +113,10 @@ addSliderAccess: false, sliderAccessArgs: null, controlType: 'slider', + oneLine: false, defaultValue: null, - parse: 'strict' + parse: 'strict', + afterInject: null }; $.extend(this._defaults, this.regional['']); }; @@ -191,7 +199,7 @@ }, onChangeMonthYear: function (year, month, dp_inst) { // Update the time as well : this prevents the time from disappearing from the $input field. - tp_inst._updateDateTime(dp_inst); + // tp_inst._updateDateTime(dp_inst); if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) { tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst); } @@ -313,11 +321,12 @@ * add our sliders to the calendar */ _addTimePicker: function (dp_inst) { - var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val(); + var currDT = $.trim((this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val()); this.timeDefined = this._parseTime(currDT); this._limitMinMaxDateTime(dp_inst, false); this._injectTimePicker(); + this._afterInject(); }, /* @@ -355,6 +364,16 @@ }, /* + * Handle callback option after injecting timepicker + */ + _afterInject: function() { + var o = this.inst.settings; + if ($.isFunction(o.afterInject)) { + o.afterInject.call(this); + } + }, + + /* * generate and inject html for timepicker into ui datepicker */ _injectTimePicker: function () { @@ -372,9 +391,9 @@ // Prevent displaying twice if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) { - var noDisplay = ' style="display:none;"', - html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' + - '<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>'; + var noDisplay = ' ui_tpicker_unit_hide', + html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + (o.oneLine && o.controlType === 'select' ? ' ui-timepicker-oneLine' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' + + '<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"></dd>'; // Create the markup for (i = 0, l = this.units.length; i < l; i++) { @@ -388,8 +407,8 @@ max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10); gridSize[litem] = 0; - html += '<dt class="ui_tpicker_' + litem + '_label"' + (show ? '' : noDisplay) + '>' + o[litem + 'Text'] + '</dt>' + - '<dd class="ui_tpicker_' + litem + '"><div class="ui_tpicker_' + litem + '_slider"' + (show ? '' : noDisplay) + '></div>'; + html += '<dt class="ui_tpicker_' + litem + '_label' + (show ? '' : noDisplay) + '">' + o[litem + 'Text'] + '</dt>' + + '<dd class="ui_tpicker_' + litem + (show ? '' : noDisplay) + '"><div class="ui_tpicker_' + litem + '_slider' + (show ? '' : noDisplay) + '"></div>'; if (show && o[litem + 'Grid'] > 0) { html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>'; @@ -415,8 +434,8 @@ // Timezone var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone; - html += '<dt class="ui_tpicker_timezone_label"' + (showTz ? '' : noDisplay) + '>' + o.timezoneText + '</dt>'; - html += '<dd class="ui_tpicker_timezone" ' + (showTz ? '' : noDisplay) + '></dd>'; + html += '<dt class="ui_tpicker_timezone_label' + (showTz ? '' : noDisplay) + '">' + o.timezoneText + '</dt>'; + html += '<dd class="ui_tpicker_timezone' + (showTz ? '' : noDisplay) + '"></dd>'; // Create the elements from string html += '</dl></div>'; @@ -499,6 +518,7 @@ this.timezone_select.change(function () { tp_inst._onTimeChange(); tp_inst._onSelectHandler(); + tp_inst._afterInject(); }); // End timezone options @@ -1057,6 +1077,7 @@ $(sel).appendTo(obj).change(function (e) { tp_inst._onTimeChange(); tp_inst._onSelectHandler(); + tp_inst._afterInject(); }); return obj; @@ -1071,7 +1092,7 @@ o[opts] = val; } else { o = opts; } - return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step')); + return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min>=0 ? o.min : $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step')); }, value: function (tp_inst, obj, unit, val) { var $t = obj.children('select'); @@ -1235,7 +1256,7 @@ ampm = ''; resTime.ampm = ''; } else { - ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM'; + ampm = $.inArray(treg[order.t].toUpperCase(), $.map(o.amNames, function (x,i) { return x.toUpperCase(); })) !== -1 ? 'AM' : 'PM'; resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0]; } } @@ -2226,4 +2247,4 @@ */ $.timepicker.version = "@@version"; -})(jQuery); +})); |