Skip to content

update from original #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 47 commits into from
Feb 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
0cf5374
New dev version
trentrichardson Mar 16, 2015
cb8200b
#795 Fix out of date css in documentation
trentrichardson Mar 19, 2015
cf32a82
- Fixed parseTime for altFieldTimeOnly use
RizziCR Apr 13, 2015
7f5ff91
Merge pull request #801 from RizziCR/dev
trentrichardson Apr 14, 2015
ec1d5e8
Fixes spacing to tabs
trentrichardson Apr 14, 2015
439a9a1
#799 - @CoryDuncan - "Now" button does not update calendar selected date
trentrichardson Apr 14, 2015
211a104
New version v1.5.3
trentrichardson Apr 19, 2015
b523fe1
Merge branch 'dev'
trentrichardson Apr 19, 2015
1e77bfe
New dev version
trentrichardson Apr 19, 2015
5b2665f
Pull #809 - @sandermarechal Update grunt-contrib-uglify to fix build …
trentrichardson May 7, 2015
776b650
Pull #813 - Move noDisplay class to class attribute by @bpahan
trentrichardson May 11, 2015
9bfd608
New Version
trentrichardson May 11, 2015
81976d7
Merge branch 'dev'
trentrichardson May 11, 2015
19e1e6a
New Dev Version
trentrichardson May 11, 2015
1d76148
#814 - @meysampg - Add persian language file to i18n
trentrichardson May 15, 2015
32cc4fb
Update README.md
gdurelle May 22, 2015
096125d
#817 - Update bower.json with main file entries
trentrichardson May 22, 2015
eff614b
Merge pull request #818 from gdurelle/patch-1
trentrichardson May 24, 2015
d31f8a2
New Version
trentrichardson May 24, 2015
4f87dc1
Merge branch 'dev'
trentrichardson May 24, 2015
47afa32
New dev version
trentrichardson May 24, 2015
ce608a2
Fix version number in bower instructions
trentrichardson May 24, 2015
254db14
Pull #823 - removes version from bower.json as it is not needed
trentrichardson Jun 13, 2015
4a57728
Pull #822 - Fixes AMD support to match jqueryui standard
trentrichardson Jun 13, 2015
72d0a55
Issue #223 - Updates gotoToday to handle timezones better
trentrichardson Jun 14, 2015
970de92
Issue #223 - revert gotoToday change for timezone
trentrichardson Jun 14, 2015
47dbb0f
Issue #223 - Apply fix to gotoToday proposed fix
trentrichardson Jun 14, 2015
101ba95
Allow direct time input from widget
insonifi Jun 26, 2015
a165d60
Adding documentation for timeInput option
insonifi Jun 26, 2015
829ffa7
Clean up some styles, missing semicolons, add example
trentrichardson Jun 29, 2015
650df7f
Merge branch 'insonifi-dev' into dev
trentrichardson Jun 29, 2015
60bff08
BugFix: Update input after pressing now button
cadi Jul 22, 2015
aaca71e
BugFix: Update input after pressing now button.
cadi Jul 22, 2015
248d09c
Merge branch 'dev' of https://github.com/carldiegelmann/jQuery-Timepi…
cadi Jul 22, 2015
477d2b5
BugFix: Update input field after pressing now button
cadi Jul 22, 2015
506e148
Merge pull request #829 from carldiegelmann/dev
trentrichardson Jul 22, 2015
fa89d85
#828 - Updates package.json to add to npm
trentrichardson Jul 22, 2015
a966f39
#828 - Fixes name to be npm friendly
trentrichardson Jul 22, 2015
eb0a187
tweak package.json
trentrichardson Jul 22, 2015
ecc41f9
Fix version in package.json
trentrichardson Jul 22, 2015
3dfe7d5
Fix version in package.json
trentrichardson Jul 22, 2015
6326162
Pull #836 - fixes "invalid-meta" warning for bower
trentrichardson Sep 2, 2015
d407ddf
#838 - Macedonian localization by @ristovskiv
trentrichardson Sep 21, 2015
f2b80be
New Version
trentrichardson Nov 14, 2015
95d3ec3
Merge branch 'dev'
trentrichardson Nov 14, 2015
f66f23c
Adds missing file
trentrichardson Nov 14, 2015
17c4f29
Merge branch 'dev'
trentrichardson Nov 14, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,28 @@ I recommend getting the eBook [Handling Time](https://sellfy.com/p/8gxZ) as it h

There is also a [Bower](http://bower.io/) package named `jqueryui-timepicker-addon`. Beware there are other similar package names that point to forks which may not be current.

Rails with Bower
-----------------
If you happen to use Rails with the [bower](gem "bower-rails", "~> 0.8.3") gem, here it is to use it easily :
#### Bowerfile
```asset "jqueryui-timepicker-addon", "1.5.6"```

#### application.js
```javascript
//= require jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon
//= require jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-fr
```

#### application.css.scss
```scss
@import "jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.css";
```

Contributing Code - Please Read!
--------------------------------
- All code contributions and bug reports are much appreciated.
- Please be sure to apply your fixes to the "dev" branch.
- Also note tabs are appreciated over spaces.
- Please read the [CONTRIBUTING.md][contributingmd] for more on using Grunt to produce builds.

[contributingmd]: CONTRIBUTING.md
[contributingmd]: CONTRIBUTING.md
4 changes: 3 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name": "jqueryui-timepicker-addon",
"version": "1.5.2",
"repository": {
"type": "git",
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
},
"main": ["dist/jquery-ui-timepicker-addon.js", "dist/jquery-ui-timepicker-addon.css"],
"ignore": [
],
"dependencies": {
}
}
46 changes: 45 additions & 1 deletion dist/i18n/jquery-ui-timepicker-addon-i18n.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! jQuery Timepicker Addon - v1.5.2 - 2015-03-15
/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
* http://trentrichardson.com/examples/timepicker
* Copyright (c) 2015 Trent Richardson; Licensed MIT */

Expand Down Expand Up @@ -248,6 +248,28 @@
isRTL: false
};

// source: src/i18n/jquery-ui-timepicker-fa.js
/* Persian translation for the jQuery Timepicker Addon */
/* Written by Meysam Pour Ganji */

$.timepicker.regional['fa'] = {
timeOnlyTitle: 'انتخاب زمان',
timeText: 'زمان',
hourText: 'ساعت',
minuteText: 'دقیقه',
secondText: 'ثانیه',
millisecText: 'میلی ثانیه',
microsecText: 'میکرو ثانیه',
timezoneText: 'منطقه زمانی',
currentText: 'الان',
closeText: 'انتخاب',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['قبل ظهر', 'AM', 'A'],
pmNames: ['بعد ظهر', 'PM', 'P'],
isRTL: true
};

// source: src/i18n/jquery-ui-timepicker-fi.js
/* Finnish translation for the jQuery Timepicker Addon */
/* Written by Juga Paazmaya (http://github.com/paazmaya) */
Expand Down Expand Up @@ -512,6 +534,28 @@
isRTL: false
};

// source: src/i18n/jquery-ui-timepicker-mk.js
/* Macedonian cyrilic translation for the jQuery Timepicker Addon */
/* Written by Vlatko Ristovski */

$.timepicker.regional['mk'] = {
timeOnlyTitle: 'Одберете време',
timeText: 'Време',
hourText: 'Час',
minuteText: 'Минути',
secondText: 'Секунди',
millisecText: 'Милисекунди',
microsecText: 'Микросекунди',
timezoneText: 'Временска зона',
currentText: 'Сега',
closeText: 'Затвори',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
};

// source: src/i18n/jquery-ui-timepicker-nl.js
/* Dutch translation for the jQuery Timepicker Addon */
/* Written by Martijn van der Lee */
Expand Down
4 changes: 2 additions & 2 deletions dist/i18n/jquery-ui-timepicker-addon-i18n.min.js

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions dist/i18n/jquery-ui-timepicker-fa.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Persian translation for the jQuery Timepicker Addon */
/* Written by Meysam Pour Ganji */
(function($) {
$.timepicker.regional['fa'] = {
timeOnlyTitle: 'انتخاب زمان',
timeText: 'زمان',
hourText: 'ساعت',
minuteText: 'دقیقه',
secondText: 'ثانیه',
millisecText: 'میلی ثانیه',
microsecText: 'میکرو ثانیه',
timezoneText: 'منطقه زمانی',
currentText: 'الان',
closeText: 'انتخاب',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['قبل ظهر', 'AM', 'A'],
pmNames: ['بعد ظهر', 'PM', 'P'],
isRTL: true
};
$.timepicker.setDefaults($.timepicker.regional['fa']);
})(jQuery);
22 changes: 22 additions & 0 deletions dist/i18n/jquery-ui-timepicker-mk.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Macedonian cyrilic translation for the jQuery Timepicker Addon */
/* Written by Vlatko Ristovski */
(function($) {
$.timepicker.regional['mk'] = {
timeOnlyTitle: 'Одберете време',
timeText: 'Време',
hourText: 'Час',
minuteText: 'Минути',
secondText: 'Секунди',
millisecText: 'Милисекунди',
microsecText: 'Микросекунди',
timezoneText: 'Временска зона',
currentText: 'Сега',
closeText: 'Затвори',
timeFormat: 'HH:mm',
timeSuffix: '',
amNames: ['AM', 'A'],
pmNames: ['PM', 'P'],
isRTL: false
};
$.timepicker.setDefaults($.timepicker.regional['mk']);
})(jQuery);
68 changes: 45 additions & 23 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,9 @@ <h4>Subscribe to Blog and Twitter</h4>
<br />

<h3>Download</h3>
<p><a href="jquery-ui-timepicker-addon.js" title="Download Timepicker Addon">Download Timepicker Addon</a></p>
<p><a href="jquery-ui-timepicker-addon.js" title="Download Timepicker Addon">Download Timepicker Addon</a> and the <a href="jquery-ui-timepicker-addon.css" title="Download CSS">required CSS</a>.</p>

<p><a href="http://github.com/trentrichardson/jQuery-Timepicker-Addon" title="Check out Timepicker on GitHub">Download/Contribute on GitHub</a> (Need the entire repo? Find a bug? See if its fixed here)</p>
<p>There is a small bit of required CSS (<a href="jquery-ui-timepicker-addon.css" title="Download CSS">Download</a>):</p>
<pre>/* css for timepicker */
.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
.ui-timepicker-div dl { text-align: left; }
.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
.ui-timepicker-div dl dd { margin: 0 10px 10px 45%; }
.ui-timepicker-div td { font-size: 90%; }
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }

.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 45% 10px 10px; }
</pre>

<p>If you prefer a hosted CDN there are a couple available: <a href="http://cdnjs.com/libraries/jquery-ui-timepicker-addon" title="Timepicker on CDNJS">CDNJS</a>, <a href="http://www.jsdelivr.com/#!jquery.ui.timepicker.addon" title="Timepicker on jsDelivr">jsDelivr</a>.</p>
<br />
Expand All @@ -126,9 +113,9 @@ <h3>Requirements</h3>

<br />
<h3>Version</h3>
<p>Version 1.5.2</p>
<p>Version 1.6.1</p>

<p>Last updated on 2015-03-15</p>
<p>Last updated on 2015-11-14</p>
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>

Expand Down Expand Up @@ -338,7 +325,10 @@ <h3>Other Options</h3>
<dl class="defs">
<dt>showButtonPanel</dt>
<dd><em>Default: true</em> - Whether to show the button panel at the bottom. This is generally needed.</dd>


<dt>timeInput</dt>
<dd><em>Default: false</em> - Allows direct input in time field</dd>

<dt>timeOnly</dt>
<dd><em>Default: false</em> - Hide the datepicker and only provide a time interface.</dd>

Expand Down Expand Up @@ -530,6 +520,7 @@ <h2>Examples</h2>
<li><a href="#timezone_examples" title="Using Timezones">Using Timezones</a></li>
<li><a href="#slider_examples" title="Slider Modifications">Slider Modifications</a></li>
<li><a href="#alt_examples" title="Alternate Field">Alternate Fields</a></li>
<li><a href="#input_examples" title="Time Input">Time Input</a></li>
<li><a href="#rest_examples" title="Time Restraints">Time Restraints</a></li>
<li><a href="#range_examples" title="Time Ranges">Time Ranges</a></li>
<li><a href="#utility_examples" title="Utilities">Utilities</a></li>
Expand Down Expand Up @@ -808,7 +799,7 @@ <h3 id="alt_examples">Alternate Fields</h3>
});
</pre>
</div>

<!-- ============= example -->
<div class="example-container">
<p>With inline mode using altField:</p>
Expand All @@ -821,6 +812,38 @@ <h3 id="alt_examples">Alternate Fields</h3>
altField: "#alt_example_4_alt",
altFieldTimeOnly: false
});
</pre>
</div>

<h3 id="input_examples">Time Input</h3>

<!-- ============= example -->
<div class="example-container">
<p>Allows time displayed inside the picker to allow being typed in.</p>
<div>
<input type="text" name="input_example_1" id="input_example_1" value="08/20/2014 01:22 pm" />
</div>
<pre>
$('#input_example_1').datetimepicker({
timeInput: true,
timeFormat: "hh:mm tt"
});
</pre>
</div>

<!-- ============= example -->
<div class="example-container">
<p>Don't show any sliders, only the time input.</p>
<div>
<input type="text" name="input_example_1" id="input_example_2" value="08/20/2014 01:22 pm" />
</div>
<pre>
$('#input_example_2').datetimepicker({
timeInput: true,
timeFormat: "hh:mm tt",
showHour: false,
showMinute: false
});
</pre>
</div>

Expand Down Expand Up @@ -925,8 +948,8 @@ <h3 id="range_examples">Time Ranges</h3>
<div class="example-container">
<p>Timepicker also includes some shortcut methods for ranges:</p>
<div>
<input type="text" name="range_example_2_start" id="range_example_2_start" value="21 Aug 2014 09:16" />
<input type="text" name="range_example_2_end" id="range_example_2_end" value="21 Aug 2014 10:16" />
<input type="text" name="range_example_2_start" id="range_example_2_start" value="" />
<input type="text" name="range_example_2_end" id="range_example_2_end" value="" />
</div>
<pre>
var startDateTextBox = $('#range_example_2_start');
Expand Down Expand Up @@ -1062,9 +1085,8 @@ <h3 id="utility_examples">Utilities</h3>
$.datepicker.parseTime('HH:mm:ss:l z', "14:36:21:765 +2000", {})
));
</pre>
</div>

</div>

</div>


Expand Down
3 changes: 3 additions & 0 deletions dist/jquery-ui-timepicker-addon.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; }

.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; border-bottom: solid 1px #555; width: 95%; }
.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus { border-bottom-color: #aaa; }

.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; }
Expand Down
Loading