10000 Remove ampm option from docs · gophermosaic/jQuery-Timepicker-Addon@b0430eb · GitHub
Skip to content
8000

Commit b0430eb

Browse files
trentrichardsontrentrichardson
committed
Remove ampm option from docs
1 parent 17a2dce commit b0430eb

File tree

2 files changed

+13
-20
lines changed

2 files changed

+13
-20
lines changed

‎index.html

+11-18
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@ <h3>Localization Options</h3>
147147
<dt>closeText</dt>
148148
<dd><em>Default: "Done", A Localization Setting</em> - Text for the Close button.</dd>
149149

150-
<dt>ampm</dt>
151-
<dd><em>Default: false, A Localization Setting</em> - Whether or not to use am/pm calculations.</dd>
152-
153150
<dt>amNames</dt>
154151
<dd><em>Default: ['AM', 'A'], A Localization Setting</em> - Array of strings to try and parse against to determine AM.</dd>
155152

@@ -225,12 +222,6 @@ <h3>Time Field Options</h3>
225222
<dt>controlType</dt>
226223
<dd><em>Default: 'slider'</em> - Whether to use 'slider' or 'select'. If 'slider' is unavailable through jQueryUI, 'select' will be used. For advanced usage you may pass an object which implements "create", "options", "value" methods to use controls other than sliders or selects. See the _controls property in the source code for more details.</dd>
227224

228-
<dt>pickerTimeFormat</dt>
229-
<dd><em>Default: (timeFormat option)</em> - How to format the time displayed within the timepicker.</dd>
230-
231-
<dt>pickerTimeSuffix</dt>
232-
<dd><em>Default: (timeSuffix option)</em> - String to place after the formatted time within the timepicker.</dd>
233-
234225
<dt>showHour</dt>
235226
<dd><em>Default: true</em> - Whether to show the hour slider.</dd>
236227

@@ -330,6 +321,12 @@ <h3>Other Options</h3>
330321
<dt>separator</dt>
331322
<dd><em>Default: " "</em> - When formatting the time this string is placed between the formatted date and formatted time.</dd>
332323

324+
<dt>pickerTimeFormat</dt>
325+
<dd><em>Default: (timeFormat option)</em> - How to format the time displayed within the timepicker.</dd>
326+
327+
<dt>pickerTimeSuffix</dt>
328+
<dd><em>Default: (timeSuffix option)</em> - String to place after the formatted time within the timepicker.</dd>
329+
333330
<dt>showTimepicker</dt>
334331
<dd><em>Default: true</em> - Whether to show the timepicker within the datepicker.</dd>
335332

@@ -445,10 +442,9 @@ <h2>Working with Localizations</h2>
445442
timezoneText: 'Часовой пояс',
446443
currentText: 'Сейчас',
447444
closeText: 'Закрыть',
448-
timeFormat: 'hh:mm tt',
445+
timeFormat: 'HH:mm',
449446
amNames: ['AM', 'A'],
450447
pmNames: ['PM', 'P'],
451-
ampm: false,
452448
isRTL: false
453449
};
454450
$.timepicker.setDefaults($.timepicker.regional['ru']);
@@ -717,8 +713,7 @@ <h3 id="alt_examples">Alternate Fields</h3>
717713
altFieldTimeOnly: false,
718714
altFormat: "yy-mm-dd",
719715
altTimeFormat: "h:m t",
720-
altSeparator: " @ ",
721-
altAmpm: false
716+
altSeparator: " @ "
722717
});
723718
</pre>
724719
</div>
@@ -748,7 +743,6 @@ <h3 id="rest_examples">Time Restraints</h3>
748743
</div>
749744
<pre>
750745
$('#rest_example_1').timepicker({
751-
ampm: true,
752746
hourMin: 8,
753747
hourMax: 16
754748
});
@@ -847,8 +841,7 @@ <h3 id="utility_examples">Utilities</h3>
847841

848842
ex13.datetimepicker({
849843
dateFormat: "D MM d, yy",
850-
separator: ' @ ',
851-
ampm: true
844+
separator: ' @ '
852845
});
853846

854847
$('#utility_example_1_setdt').click(function(){
@@ -876,7 +869,7 @@ <h3 id="utility_examples">Utilities</h3>
876869

877870
<pre>
878871
$('#utility_example_2').text(
879-
$.datepicker.formatTime('hh:mm z', { hour: 14, minute: 36, timezone: '+2000' }, { ampm: false })
872+
$.datepicker.formatTime('HH:mm z', { hour: 14, minute: 36, timezone: '+2000' }, {})
880873
);
881874
</pre>
882875
</div>
@@ -896,7 +889,7 @@ <h3 id="utility_examples">Utilities</h3>
896889

897890
<pre>
898891
$('#utility_example_3').text(JSON.stringify(
899-
$.datepicker.parseTime('hh:mm:ss:l z', "14:36:21:765 +2000", { ampm: false })
892+
$.datepicker.parseTime('HH:mm:ss:l z', "14:36:21:765 +2000", {})
900893
));
901894
</pre>
902895
</div>

‎jquery-ui-timepicker-addon.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
this.regional[''] = { // Default regional settings
4343
currentText: 'Now',
4444
closeText: 'Done',
45-
ampm: false,
45+
//ampm: false,
4646
amNames: ['AM', 'A'],
4747
pmNames: ['PM', 'P'],
4848
timeFormat: 'HH:mm',
@@ -95,7 +95,7 @@
9595
separator: ' ',
9696
altFieldTimeOnly: true,
9797
altTimeFormat: null,
98-
altAmpm: null,
98+
//altAmpm: null,
9999
altSeparator: null,
100100
altTimeSuffix: null,
101101
pickerTimeFormat: null,

0 commit comments

Comments
 (0)