Merge branch 'dev'

Author: trentrichardson

index.html

@@ -19,9 +19,9 @@
 			pre{ padding: 20px; background-color: #ffffcc; border: solid 1px #fff; }
 			.wrapper{ background-color: #ffffff; width: 800px; border: solid 1px #eeeeee; padding: 20px; margin: 0 auto; }
 			.example-container{ background-color: #f4f4f4; border-bottom: solid 2px #777777; margin: 0 0 40px 0; padding: 20px; }
-			.example-container p{ font-weight: bold; }
+			.example-container p{  }
 			.example-container > dl dt{ font-weight: bold; height: 20px; }
-			.example-container > dl dd{ margin: -20px 0 10px 100px; border-bottom: solid 1px #fff; }
+			.example-container > dl dd{ margin: -20px 0 10px 140px; border-bottom: solid 1px #fff; }
 			.example-container input{ width: 150px; }
 			.clear{ clear: both; }
 			#ui-datepicker-div, .ui-datepicker{ font-size: 80%; }			
@@ -30,8 +30,8 @@
 		<link rel="stylesheet" media="all" type="text/css" href="http://code.jquery.com/ui/1.8.21/themes/ui-lightness/jquery-ui.css" />
 		<link rel="stylesheet" media="all" type="text/css" href="jquery-ui-timepicker-addon.css" />
 
-		<script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
-		<script type="text/javascript" src="http://code.jquery.com/ui/1.8.21/jquery-ui.min.js"></script>
+		<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js"></script>
+		<script type="text/javascript" src="http://code.jquery.com/ui/1.8.23/jquery-ui.min.js"></script>
 		<script type="text/javascript" src="jquery-ui-timepicker-addon.js"></script>
 		<script type="text/javascript" src="jquery-ui-sliderAccess.js"></script>
 		<script type="text/javascript">
@@ -72,6 +72,8 @@ <h2>Download</h2>
 .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
 </pre>
 
+			<p>You also need to include jQuery UI with datepicker and slider wigits. Order: jQuery, jQueryUI, Timepicker.</p>
+
 			<h2>Donation</h2>
 			<p>Has this Timepicker Addon been helpful to you?</p>
 			<div class="donation">
@@ -139,6 +141,7 @@ <h2>Some Examples</h2>
 			<dt>T</dt><dd>A or P for AM/PM</dd>
 			<dt>tt</dt><dd>am or pm for AM/PM</dd>
 			<dt>TT</dt><dd>AM or PM for AM/PM</dd>
+			<dt>z</dt><dd>Timezone (as defined by <a href="#example15a" title="timezoneList">timezoneList</a>)</dd>
 		</dl>
 		<p>Also related to your timeFormat, but not required, is the separator option</p>
 		<dl>
@@ -164,6 +167,7 @@ <h2>Some Examples</h2>
 			<dt>showMinute</dt><dd>Show the minute, default=true</dd>
 			<dt>showSecond</dt><dd>Show the second, default=false</dd>
 			<dt>showMillisec</dt><dd>Show the millisecond, default=false</dd>
+			<dt>showTimezone</dt><dd>Show the timezone, default=false</dd>
 		</dl>
 		<div>
 			<input type="text" name="example5" id="example5" value="" />
@@ -314,18 +318,24 @@ <h2>Some Examples</h2>
 };
 $.datepicker.setDefaults($.datepicker.regional['ru']);
 
+
 $.timepicker.regional['ru'] = {
 	timeOnlyTitle: 'Выберите время',
 	timeText: 'Время',
 	hourText: 'Часы',
 	minuteText: 'Минуты',
 	secondText: 'Секунды',
-	millisecText: 'миллисекунды',
-	currentText: 'Теперь',
+	millisecText: 'Миллисекунды',
+	timezoneText: 'Часовой пояс',
+	currentText: 'Сейчас',
 	closeText: 'Закрыть',
+	timeFormat: 'hh:mm tt',
+	amNames: ['AM', 'A'],
+	pmNames: ['PM', 'P'],
 	ampm: false
 };
 $.timepicker.setDefaults($.timepicker.regional['ru']);
+
 </pre>
 
 		</div>
@@ -423,16 +433,65 @@ <h2>Some Examples</h2>
 });
 </pre>
 	</div>
+
+
+	<!-- ============= example -->
+	<div class="example-container">
+		<p>The following demonstrates how to use timezones and timezone options.</p>
+		<dl>
+			<dt>timezoneList</dt><dd>An array of timezones, either with strings ['-0500','-0600',..] or objects [ { value: '-0500', label: 'EST'}, { value: '-0600', label: 'CST' },..]</dd>
+			<dt>defaultTimezone</dt><dd>The default selected timezone in the dropdown. default='+0000'</dd>
+			<dt>useLocalTimezone</dt><dd>Use the local timezone of the client's browser. default=false</dd>
+			<dt>timezoneIso8601</dt><dd>Formats the timezones in the timezone list in 8601 format</dd>
+		</dl>
+		<p>The third example here demonstrates using the abbreviation for timezones.  If this is used defaultTimezone must match the value (abbreviation).  Do note that useLocalTimezone may not function properly when using abbreviations as it will only work with '+0000' formats.</p>
+		<p>Daylight savings time may be interpreted as a timezone.  Create your own timezoneList and specify entries for Daylight Savings or use useLocalTimezone to help get the correct offset.</p>
+		<div>
+			<input type="text" name="example15a" id="example15a" value="" />
+			<input type="text" name="example15b" id="example15b" value="" />
+			<input type="text" name="example15c" id="example15c" value="" />
+		</div>
 
+<pre>
+$('#example15a').datetimepicker({
+	timeFormat: 'hh:mm z',
+	showTimezone: true
+});
+
+$('#example15b').datetimepicker({
+	timeFormat: 'hh:mm z',
+	showTimezone: true,
+	timezoneList: [ 
+			{ value: '-0500', label: 'Eastern'}, 
+			{ value: '-0600', label: 'Central' }, 
+			{ value: '-0700', label: 'Mountain' }, 
+			{ value: '-0800', label: 'Pacific' } 
+		]
+});
+
+$('#example15c').datetimepicker({
+	timeFormat: 'hh:mm z',
+	showTimezone: true,
+	timezone: 'MT',
+	timezoneList: [ 
+			{ value: 'ET', label: 'Eastern'}, 
+			{ value: 'CT', label: 'Central' }, 
+			{ value: 'MT', label: 'Mountain' }, 
+			{ value: 'PT', label: 'Pacific' } 
+		]
+});
+</pre>
+	</div>
+
 	<!-- ============= example -->
 	<div class="example-container">
 		<p>Connect to the onSelect event (Use your browser's js console for this example).</p>
 		<div>
-			<input type="text" name="example15" id="example15" value="" />
+			<input type="text" name="example16" id="example16" value="" />
 		</div>
 
 <pre>
-$('#example15').datetimepicker({
+$('#example16').datetimepicker({
 	showSecond: true,
 	showMillisec: true,
 	timeFormat: 'hh:mm:ss:l',
@@ -448,45 +507,44 @@ <h2>Some Examples</h2>
 	<div class="example-container">
 		<p>Create a datetime range with a start and end date.</p>
 		<div>
-			<input type="text" name="example16_start" id="example16_start" value="" /> <input type="text" name="example16_end" id="example16_end" value="" />
+			<input type="text" name="example17_start" id="example17_start" value="" /> <input type="text" name="example17_end" id="example17_end" value="" />
 		</div>
 
 <pre>
-$('#example16_start').datetimepicker({
-    onClose: function(dateText, inst) {
-        var endDateTextBox = $('#example16_end');
-        if (endDateTextBox.val() != '') {
-            var testStartDate = new Date(dateText);
-            var testEndDate = new Date(endDateTextBox.val());
-            if (testStartDate > testEndDate)
-                endDateTextBox.val(dateText);
-        }
-        else {
-            endDateTextBox.val(dateText);
-        }
-    },
-    onSelect: function (selectedDateTime){
-        var start = $(this).datetimepicker('getDate');
-        $('#example16_end').datetimepicker('option', 'minDate', new Date(start.getTime()));
-    }
+var startDateTextBox = $('#example17_start');
+var endDateTextBox = $('#example17_end');
+
+startDateTextBox.datetimepicker({ 
+	onClose: function(dateText, inst) {
+		if (endDateTextBox.val() != '') {
+			var testStartDate = startDateTextBox.datetimepicker('getDate');
+			var testEndDate = endDateTextBox.datetimepicker('getDate');
+			if (testStartDate > testEndDate)
+				endDateTextBox.datetimepicker('setDate', testStartDate);
+		}
+		else {
+			endDateTextBox.val(dateText);
+		}
+	},
+	onSelect: function (selectedDateTime){
+		endDateTextBox.datetimepicker('option', 'minDate', startDateTextBox.datetimepicker('getDate') );
+	}
 });
-$('#example16_end').datetimepicker({
-    onClose: function(dateText, inst) {
-        var startDateTextBox = $('#example16_start');
-        if (startDateTextBox.val() != '') {
-            var testStartDate = new Date(startDateTextBox.val());
-            var testEndDate = new Date(dateText);
-            if (testStartDate > testEndDate)
-                startDateTextBox.val(dateText);
-        }
-        else {
-            startDateTextBox.val(dateText);
-        }
-    },
-    onSelect: function (selectedDateTime){
-        var end = $(this).datetimepicker('getDate');
-        $('#example16_start').datetimepicker('option', 'maxDate', new Date(end.getTime()) );
-    }
+endDateTextBox.datetimepicker({ 
+	onClose: function(dateText, inst) {
+		if (startDateTextBox.val() != '') {
+			var testStartDate = startDateTextBox.datetimepicker('getDate');
+			var testEndDate = endDateTextBox.datetimepicker('getDate');
+			if (testStartDate > testEndDate)
+				startDateTextBox.datetimepicker('setDate', testEndDate);
+		}
+		else {
+			startDateTextBox.val(dateText);
+		}
+	},
+	onSelect: function (selectedDateTime){
+		startDateTextBox.datetimepicker('option', 'maxDate', endDateTextBox.datetimepicker('getDate') );
+	}
 });
 </pre>
 	</div>
@@ -495,11 +553,11 @@ <h2>Some Examples</h2>
 	<div class="example-container">
 		<p>Use the <a href="http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/" title="jQueryUI Slider Accessibility Addon">sliderAccess addon</a> to allow timepicker sliders to work on touch devices.</p>
 		<div>
-			<div id="example17"></div>
+			<div id="example18"></div>
 		</div>
 
 <pre>
-$('#example17').datetimepicker({
+$('#example18').datetimepicker({
 	addSliderAccess: true,
 	sliderAccessArgs: { touchonly: false }
 });
@@ -517,20 +575,22 @@ <h2>Some Examples</h2>
 		</dl>
 
 		<div>
-			<div id="example18"></div>
+			<div id="example19"></div>
 		</div>
 
 <pre>
-$('#example18').text(
+$('#example19').text(
 	$.datepicker.formatTime('hh:mm z', { hour: 14, minute: 36, timezone: '+2000' }, { ampm: false })
 );
 </pre>
 	</div>
+
+
 
 			<h2>Version</h2>
-			<p>Version 1.0.1</p>
+			<p>Version 1.0.2</p>
 
-			<p>Last updated on 07/01/2012</p>
+			<p>Last updated on 09/8/2012</p>
 			<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under both MIT and GPL licenses. This means that you can choose the license that best suits your project, and use it accordingly. </p>
 			<p><a href="http://trentrichardson.com/Impromptu/GPL-LICENSE.txt" title="GPL License">GPL License</a></p>
 			<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>