Skip to content

Commit c892bd3

Browse files
trentrichardsontrentrichardson
committed
Merge branch 'dev'
2 parents 18de616 + fe684fa commit c892bd3

14 files changed

+105
-19
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-timepicker-addon",
3-
"version": "1.4",
3+
"version": "1.4.1",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"

‎dist/i18n/jquery-ui-timepicker-sr-RS.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* Serbian cyrilic translation for the jQuery Timepicker Addon */
2+
/* Written by Vladimir Jelovac */
3+
(function($) {
4+
$.timepicker.regional['sr-RS'] = {
5+
timeOnlyTitle: 'Одаберите време',
6+
timeText: 'Време',
7+
hourText: 'Сати',
8+
minuteText: 'Минути',
9+
secondText: 'Секунде',
10+
millisecText: 'Милисекунде',
11+
microsecText: 'Микросекунде',
12+
timezoneText: 'Временска зона',
13+
currentText: 'Сада',
14+
closeText: 'Затвори',
15+
timeFormat: 'HH:mm',
16+
amNames: ['AM', 'A'],
17+
pmNames: ['PM', 'P'],
18+
isRTL: false
19+
};
20+
$.timepicker.setDefaults($.timepicker.regional['sr-RS']);
21+
})(jQuery);

‎dist/i18n/jquery-ui-timepicker-sr-YU.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* Serbian latin translation for the jQuery Timepicker Addon */
2+
/* Written by Vladimir Jelovac */
3+
(function($) {
4+
$.timepicker.regional['sr-YU'] = {
5+
timeOnlyTitle: 'Odaberite vreme',
6+
timeText: 'Vreme',
7+
hourText: 'Sati',
8+
minuteText: 'Minuti',
9+
secondText: 'Sekunde',
10+
millisecText: 'Milisekunde',
11+
microsecText: 'Mikrosekunde',
12+
timezoneText: 'Vremenska zona',
13+
currentText: 'Sada',
14+
closeText: 'Zatvori',
15+
timeFormat: 'HH:mm',
16+
amNames: ['AM', 'A'],
17+
pmNames: ['PM', 'P'],
18+
isRTL: false
19+
};
20+
$.timepicker.setDefaults($.timepicker.regional['sr-YU']);
21+
})(jQuery);

‎dist/index.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ <h4>Handling Time eBook</h4>
8787
<a href="http://trentrichardson.com/ebooks/handling-time/" title="Handling Time eBook"><img src="http://trentrichardson.com/wp-content/uploads/2013/04/time-book-titlepage.jpg" alt="Handling Time eBook" style="float:left;width:100px;margin:0 15px 15px 0;" /></a>
8888
<p class="buyp"><a href="https://sellfy.com/p/8gxZ" id="8gxZ" class="sellfy-buy-button">buy</a> eBook + Example code</p>
8989
<p class="buyp"><a href="https://sellfy.com/p/LvAG" id="LvAG" class="sellfy-buy-button">buy</a> eBook</p>
90-
<p class="buyp"><a href="http://gum.co/ZWYO" class="gumroad-button">Handling Time</a></p>
9190
<div class="clear"></div>
9291
</div>
9392

@@ -125,9 +124,9 @@ <h3>Requirements</h3>
125124

126125
<br />
127126
<h3>Version</h3>
128-
<p>Version 1.4</p>
127+
<p>Version 1.4.1</p>
129128

130-
<p>Last updated on 2013-08-11</p>
129+
<p>Last updated on 2013-11-10</p>
131130
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
132131
<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
133132

@@ -444,7 +443,7 @@ <h2>Working with Localizations</h2>
444443
hourText: 'Часы',
445444
minuteText: 'Минуты',
446445
secondText: 'Секунды',
447-
currentText: 'Теперь',
446+
currentText: 'Сейчас',
448447
closeText: 'Закрыть'
449448
});
450449
</pre>
@@ -958,7 +957,6 @@ <h3 id="utility_examples">Utilities</h3>
958957
</script>
959958

960959
<script type="text/javascript" src="https://sellfy.com/js/api_buttons.js"></script>
961-
<script type="text/javascript" src="https://gumroad.com/js/gumroad.js"></script>
962960

963961
<script type="text/javascript"> /*
964962
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jQuery Timepicker Addon - v1.4 - 2013-08-11
1+
/*! jQuery Timepicker Addon - v1.4.1 - 2013-11-10
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2013 Trent Richardson; Licensed MIT */
44
(function ($) {
@@ -16,7 +16,7 @@
1616
*/
1717
$.extend($.ui, {
1818
timepicker: {
19-
version: "1.4"
19+
version: "1.4.1"
2020
}
2121
});
2222

@@ -743,6 +743,9 @@
743743
if (microsec !== false) {
744744
microsec = parseInt(microsec, 10);
745745
}
746+
if (timezone !== false) {
747+
timezone = parseInt(timezone, 10);
748+
}
746749

747750
var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
748751

@@ -829,7 +832,7 @@
829832
var formattedDateTime = this.formattedDate;
830833

831834
// if a slider was changed but datepicker doesn't have a value yet, set it
832-
if (dp_inst.lastVa === "") {
835+
if (dp_inst.lastVal === "") {
833836
dp_inst.currentYear = dp_inst.selectedYear;
834837
dp_inst.currentMonth = dp_inst.selectedMonth;
835838
dp_inst.currentDay = dp_inst.selectedDay;
@@ -2129,6 +2132,6 @@
21292132
/*
21302133
* Keep up with the version
21312134
*/
2132-
$.timepicker.version = "1.4";
2135+
$.timepicker.version = "1.4.1";
21332136

21342137
})(jQuery);

‎dist/jquery-ui-timepicker-addon.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jquery-ui-timepicker-addon.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "jquery-ui-timepicker-addon",
33
"title": "jQuery Timepicker Addon",
44
"description": "A timepicker addon for jQueryUI datepicker.",
5-
"version": "1.4",
5+
"version": "1.4.1",
66
"homepage": "http://trentrichardson.com/examples/timepicker",
77
"author": {
88
"name": "Trent Richardson",

‎src/docs/footer.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
</script>
2323

2424
<script type="text/javascript" src="https://sellfy.com/js/api_buttons.js"></script>
25-
<script type="text/javascript" src="https://gumroad.com/js/gumroad.js"></script>
2625

2726
<script type="text/javascript"> /*
2827
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

‎src/docs/i18n.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2>Working with Localizations</h2>
1515
hourText: 'Часы',
1616
minuteText: 'Минуты',
1717
secondText: 'Секунды',
18-
currentText: 'Теперь',
18+
currentText: 'Сейчас',
1919
closeText: 'Закрыть'
2020
});
2121
</pre>

‎src/docs/intro.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ <h4>Handling Time eBook</h4>
1212
<a href="http://trentrichardson.com/ebooks/handling-time/" title="Handling Time eBook"><img src="http://trentrichardson.com/wp-content/uploads/2013/04/time-book-titlepage.jpg" alt="Handling Time eBook" style="float:left;width:100px;margin:0 15px 15px 0;" /></a>
1313
<p class="buyp"><a href="https://sellfy.com/p/8gxZ" id="8gxZ" class="sellfy-buy-button">buy</a> eBook + Example code</p>
1414
<p class="buyp"><a href="https://sellfy.com/p/LvAG" id="LvAG" class="sellfy-buy-button">buy</a> eBook</p>
15-
<p class="buyp"><a href="http://gum.co/ZWYO" class="gumroad-button">Handling Time</a></p>
1615
<div class="clear"></div>
1716
</div>
1817

‎src/i18n/jquery-ui-timepicker-sr-RS.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* Serbian cyrilic translation for the jQuery Timepicker Addon */
2+
/* Written by Vladimir Jelovac */
3+
(function($) {
4+
$.timepicker.regional['sr-RS'] = {
5+
timeOnlyTitle: 'Одаберите време',
6+
timeText: 'Време',
7+
hourText: 'Сати',
8+
minuteText: 'Минути',
9+
secondText: 'Секунде',
10+
millisecText: 'Милисекунде',
11+
microsecText: 'Микросекунде',
12+
timezoneText: 'Временска зона',
13+
currentText: 'Сада',
14+
closeText: 'Затвори',
15+
timeFormat: 'HH:mm',
16+
amNames: ['AM', 'A'],
17+
pmNames: ['PM', 'P'],
18+
isRTL: false
19+
};
20+
$.timepicker.setDefaults($.timepicker.regional['sr-RS']);
21+
})(jQuery);

‎src/i18n/jquery-ui-timepicker-sr-YU.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* Serbian latin translation for the jQuery Timepicker Addon */
2+
/* Written by Vladimir Jelovac */
3+
(function($) {
4+
$.timepicker.regional['sr-YU'] = {
5+
timeOnlyTitle: 'Odaberite vreme',
6+
timeText: 'Vreme',
7+
hourText: 'Sati',
8+
minuteText: 'Minuti',
9+
secondText: 'Sekunde',
10+
millisecText: 'Milisekunde',
11+
microsecText: 'Mikrosekunde',
12+
timezoneText: 'Vremenska zona',
13+
currentText: 'Sada',
14+
closeText: 'Zatvori',
15+
timeFormat: 'HH:mm',
16+
amNames: ['AM', 'A'],
17+
pmNames: ['PM', 'P'],
18+
isRTL: false
19+
};
20+
$.timepicker.setDefaults($.timepicker.regional['sr-YU']);
21+
})(jQuery);

‎src/jquery-ui-timepicker-addon.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,9 @@
749749
if (microsec !== false) {
750750
microsec = parseInt(microsec, 10);
751751
}
752+
if (timezone !== false) {
753+
timezone = parseInt(timezone, 10);
754+
}
752755

753756
var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
754757

@@ -835,7 +838,7 @@
835838
var formattedDateTime = this.formattedDate;
836839

837840
// if a slider was changed but datepicker doesn't have a value yet, set it
838-
if (dp_inst.lastVa === "") {
841+
if (dp_inst.lastVal === "") {
839842
dp_inst.currentYear = dp_inst.selectedYear;
840843
dp_inst.currentMonth = dp_inst.selectedMonth;
841844
dp_inst.currentDay = dp_inst.selectedDay;

0 commit comments

Comments
 (0)