Skip to content

Commit 72f1867

Browse files
trentrichardsontrentrichardson
committed
Merge branch 'dev'
2 parents 17c4f29 + 547daae commit 72f1867

15 files changed

+316
-252
lines changed

‎bower.json

+9
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
},
77
"main": ["dist/jquery-ui-timepicker-addon.js", "dist/jquery-ui-timepicker-addon.css"],
88
"ignore": [
9+
"/CONTRIBUTING.md",
10+
"/Gruntfile.js",
11+
"/README.md",
12+
"/composer.json",
13+
"/jquery-ui-timepicker-addon.json",
14+
"/lib",
15+
"/package.json",
16+
"/src",
17+
"/test"
918
],
1019
"dependencies": {
1120
}

‎dist/i18n/jquery-ui-timepicker-addon-i18n.js

+26-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
1+
/*! jQuery Timepicker Addon - v1.6.2 - 2016-04-20
22
* http://trentrichardson.com/examples/timepicker
3-
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
3+
* Copyright (c) 2016 Trent Richardson; Licensed MIT */
44

55
(function($){
66

@@ -168,8 +168,8 @@
168168
hourText: 'Ώρες',
169169
minuteText: 'Λεπτά',
170170
secondText: 'Δευτερόλεπτα',
171-
millisecText: 'μιλιδευτερόλεπτο',
172-
microsecText: 'Microseconds',
171+
millisecText: 'Χιλιοστοδευτερόλεπτα',
172+
microsecText: 'Μικροδευτερόλεπτα',
173173
timezoneText: 'Ζώνη ώρας',
174174
currentText: 'Τώρα',
175175
closeText: 'Κλείσιμο',
@@ -754,6 +754,28 @@
754754
isRTL: false
755755
};
756756

757+
// source: src/i18n/jquery-ui-timepicker-sq.js
758+
/* Albanian translation for the jQuery Timepicker Addon */
759+
/* Written by Olti Buzi */
760+
761+
$.timepicker.regional['sq'] = {
762+
timeOnlyTitle: 'Zgjidh orarin',
763+
timeText: 'Orari',
764+
hourText: 'Ora',
765+
minuteText: 'Minuta',
766+
secondText: 'Sekonda',
767+
millisecText: 'Minisekonda',
768+
microsecText: 'Mikrosekonda',
769+
timezoneText: 'Zona kohore',
770+
currentText: 'Tani',
771+
closeText: 'Mbyll',
772+
timeFormat: 'HH:mm',
773+
timeSuffix: '',
774+
amNames: ['m.', 'AM', 'A'],
775+
pmNames: ['p.', 'PM', 'P'],
776+
isRTL: false
777+
};
778+
757779
// source: src/i18n/jquery-ui-timepicker-sr-RS.js
758780
/* Serbian cyrilic translation for the jQuery Timepicker Addon */
759781
/* Written by Vladimir Jelovac */

‎dist/i18n/jquery-ui-timepicker-addon-i18n.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/i18n/jquery-ui-timepicker-el.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
hourText: 'Ώρες',
88
minuteText: 'Λεπτά',
99
secondText: 'Δευτερόλεπτα',
10-
millisecText: 'μιλιδευτερόλεπτο',
11-
microsecText: 'Microseconds',
10+
millisecText: 'Χιλιοστοδευτερόλεπτα',
11+
microsecText: 'Μικροδευτερόλεπτα',
1212
timezoneText: 'Ζώνη ώρας',
1313
currentText: 'Τώρα',
1414
closeText: 'Κλείσιμο',
@@ -19,4 +19,4 @@
1919
isRTL: false
2020
};
2121
$.timepicker.setDefaults($.timepicker.regional['el']);
22-
})(jQuery);
22+
})(jQuery);

‎dist/index.html

+19-41
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
3-
<head>
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
5-
<title>Adding a Timepicker to jQuery UI Datepicker</title>
5+
<title>Adding a Timepicker to jQuery UI Datepicker</title>
66
<meta name="Description" content="jQuery Timepicker Addon. Add a timepicker to your jQuery UI Datepicker. With options to show only time, format time, and much more." />
77
<meta name="Keywords" content="jQuery, UI, datepicker, timepicker, datetime, time, format" />
8-
9-
<style type="text/css">
8+
9+
<style type="text/css">
1010
body,img,p,h1,h2,h3,h4,h5,h6,form,table,td,ul,ol,li,dl,dt,dd,pre,blockquote,fieldset,label{
1111
margin:0;
1212
padding:0;
@@ -30,29 +30,27 @@
3030
#tabs{ margin: 20px -20px; border: none; }
3131
#tabs, #ui-datepicker-div, .ui-datepicker{ font-size: 85%; }
3232
.clear{ clear: both; }
33-
33+
3434
.example-container{ background-color: #f4f4f4; border-bottom: solid 2px #777777; margin: 0 0 20px 40px; padding: 20px; }
3535
.example-container input{ border: solid 1px #aaa; padding: 4px; width: 175px; }
3636
.ebook{}
3737
.ebook img.ebookimg{ float: left; margin: 0 15px 15px 0; width: 100px; }
3838
.ebook .buyp a iframe{ margin-bottom: -5px; }
39-
</style>
40-
39+
</style>
40+
4141
<link rel="stylesheet" media="all" type="text/css" href="http://code.jquery.com/ui/1.11.0/themes/smoothness/jquery-ui.css" />
4242
<link rel="stylesheet" media="all" type="text/css" href="jquery-ui-timepicker-addon.css" />
43-
44-
</head>
45-
<body>
43+
44+
</head>
45+
<body>
4646
<div class="wrapper">
47-
<h1>Adding a Timepicker to jQuery UI Datepicker</h1>
48-
47+
<h1>Adding a Timepicker to jQuery UI Datepicker</h1>
48+
4949
<p>The timepicker addon adds a timepicker to jQuery UI Datepicker, thus the datepicker and slider components (jQueryUI) are required for using any of these. In addition all datepicker options are still available through the timepicker addon.</p>
50-
50+
5151
<p>If you are interested in contributing to Timepicker Addon please <a href="http://github.com/trentrichardson/jQuery-Timepicker-Addon" title="Check out Timepicker on GitHub">check it out on GitHub</a>. If you do make additions please keep in mind I enjoy tabs over spaces,.. But contributions are welcome in any form.</p>
52-
52+
5353
<p><a href="http://trentrichardson.com" title="Back to Blog">Back to Blog</a> or <a href="http://twitter.com/practicalweb" title="Follow Me on Twitter">Follow on Twitter</a></p>
54-
55-
<a href="http://carbounce.com" title="Car Bounce" style="float: right;display: inline-block;width:380px;padding: 10px;background-color: #fbfbfb;border: dotted 4px #e8e8e8;color: #9EC45F;font-size: 16px;text-decoration:none;letter-spacing:1px;"><img src="http://carbounce.com/img/logo_small.png" alt="Car Bounce" align="left" style="margin-right: 20px;"/>Try my new app to keep you informed of your car's financing status and value.</a>
5654

5755
<h2>Donation</h2>
5856
<p>Has this Timepicker Addon been helpful to you?</p>
@@ -73,6 +71,7 @@ <h2>Donation</h2>
7371
<li><a href="#tp-localization" title="Examples">Localization</a></li>
7472
<li><a href="#tp-examples" title="Examples">Examples</a></li>
7573
</ul>
74+
7675
<!-- ############################################################################# -->
7776
<!-- Getting Started
7877
<!-- ############################################################################# -->
@@ -113,9 +112,9 @@ <h3>Requirements</h3>
113112

114113
<br />
115114
<h3>Version</h3>
116-
<p>Version 1.6.1</p>
115+
<p>Version 1.6.2</p>
117116

118-
<p>Last updated on 2015-11-14</p>
117+
<p>Last updated on 2016-04-20</p>
119118
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
120119
<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
121120

@@ -609,27 +608,6 @@ <h3 id="timezone_examples">Using Timezones</h3>
609608
{ value: -480, label: 'Pacific' }
610609
]
611610
});
612-
</pre>
613-
</div>
614-
615-
<!-- ============= example -->
616-
<div class="example-container">
617-
<p>You may also use timezone string abbreviations for values. This should be used with caution. Computing accurate javascript Date objects may not be possible when trying to retrieve or set the date from timepicker (see setDate and getDate examples below). For simple input values however this should work.</p>
618-
<div>
619-
<input type="text" name="timezone_example_3" id="timezone_example_3" value="" />
620-
</div>
621-
<pre>
622-
$('#timezone_example_3').datetimepicker({
623-
timeFormat: 'HH:mm z',
624-
timezone: 'MT',
625-
timezoneList: [
626-
{ value: 'ET', label: 'Eastern'},
627-
{ value: 'CT', label: 'Central' },
628-
{ value: 'MT', label: 'Mountain' },
629-
{ value: 'PT', label: 'Pacific' }
630-
]
631-
});
632-
633611
</pre>
634612
</div>
635613

0 commit comments

Comments
 (0)