Date: Sat, 29 Sep 2012 14:41:42 -0400
Subject: [PATCH 2/9] Update last updated date
---
index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/index.html b/index.html
index 4a24fb7..c29a3de 100644
--- a/index.html
+++ b/index.html
@@ -120,7 +120,7 @@ Requirements
Version
Version 1.0.4
- Last updated on 09/15/2012
+ Last updated on 09/29/2012
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.
GPL License
MIT License
From 6e2d61679c68f0425b2eea5350fae12895ba7174 Mon Sep 17 00:00:00 2001
From: Trent Richardson
Date: Sun, 5 May 2013 10:43:58 -0400
Subject: [PATCH 3/9] Updates docs
---
index.html | 3 +++
1 file changed, 3 insertions(+)
diff --git a/index.html b/index.html
index cd5ce08..cf02064 100644
--- a/index.html
+++ b/index.html
@@ -96,6 +96,9 @@ Highly Recommended
Handling Time eBook
Check out the Handling Time eBook to learn from the basic setup to advanced i18n usage, and from client's javascript to the server's database.
+ buy
+
+
Subscribe to Blog and Twitter
Subscribe to my blog via email and follow @PracticalWeb on Twitter. I post for nearly every new version, so you know about updates.
From ce3acd87971f04be08c0a7c2cbb18a25acf891c0 Mon Sep 17 00:00:00 2001
From: Trent Richardson
Date: Tue, 28 May 2013 15:10:12 -0400
Subject: [PATCH 4/9] Updates docs
---
index.html | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/index.html b/index.html
index cf02064..e3056a4 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,9 @@ Highly Recommended
Handling Time eBook
Check out the Handling Time eBook to learn from the basic setup to advanced i18n usage, and from client's javascript to the server's database.
- buy
+ buy on Sellfy with Paypal
+ Handling Time on Gumroad with Credit Card
Subscribe to Blog and Twitter
From 84e18084022ec76ab43d76f89c2bc1980412a976 Mon Sep 17 00:00:00 2001
From: Trent Richardson
Date: Sat, 8 Jun 2013 09:58:37 -0400
Subject: [PATCH 5/9] Updates docs
---
index.html | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/index.html b/index.html
index e3056a4..43db269 100644
--- a/index.html
+++ b/index.html
@@ -33,6 +33,9 @@
.example-container{ background-color: #f4f4f4; border-bottom: solid 2px #777777; margin: 0 0 20px 40px; padding: 20px; }
.example-container input{ border: solid 1px #aaa; padding: 4px; width: 175px; }
+ .ebook{}
+ .ebook img.ebookimg{ float: left; margin: 0 15px 15px 0; width: 100px; }
+ .ebook .buyp a iframe{ margin-bottom: -5px; }
Donation
Getting Started
Highly Recommended
- Handling Time eBook
- Check out the Handling Time eBook to learn from the basic setup to advanced i18n usage, and from client's javascript to the server's database.
- buy on Sellfy with Paypal
- Handling Time on Gumroad with Credit Card
-
+
+
Check out the Handling Time eBook to learn from the basic setup to advanced i18n usage, and from client's javascript to the server's database.
+
+
buy eBook
+
buy eBook + Example code
+
Handling Time
+
+
Subscribe to Blog and Twitter
Subscribe to my blog via email and follow @PracticalWeb on Twitter. I post for nearly every new version, so you know about updates.
@@ -947,6 +953,10 @@ Utilities
+
+
+
+
/*
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
From bef7fab5b257fc5ad6c51b17ae14925f2cf6d85e Mon Sep 17 00:00:00 2001
From: Trent Richardson
Date: Sat, 15 Jun 2013 08:19:34 -0400
Subject: [PATCH 6/9] Updates docs
---
index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/index.html b/index.html
index 43db269..64cd58c 100644
--- a/index.html
+++ b/index.html
@@ -101,8 +101,8 @@ Handling Time eBook
Check out the Handling Time eBook to learn from the basic setup to advanced i18n usage, and from client's javascript to the server's database.
-
buy eBook
buy eBook + Example code
+
buy eBook
Handling Time
From eb0a1874ac2835911fe2a8b00ae6dc41553936d4 Mon Sep 17 00:00:00 2001
From: Trent
Date: Wed, 22 Jul 2015 10:00:30 -0400
Subject: [PATCH 7/9] tweak package.json
---
package.json | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index b5273f0..2864210 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,30 @@
{
- "name": "jQuery-Timepicker-Addon",
+ "name": "jquery-ui-timepicker-addon",
"version": "0.0.0-ignored",
"engines": {
"node": ">= 0.8.0"
},
+ "keywords": [
+ "timepicker", "jquery", "datetime", "jquery-ui"
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
+ },
+ "licenses": [
+ {
+ "type": "MIT",
+ "url": "https://raw.github.com/trentrichardson/jQuery-Timepicker-Addon/master/LICENSE-MIT"
+ }
+ ],
+ "homepage": "http://trentrichardson.com/examples/timepicker",
+ "main": "./dist/jquery-ui-timepicker-addon.js",
+ "browser": "./dist/jquery-ui-timepicker-addon.js",
"scripts": {
- "test": "grunt jasmine"
+ "start": "grunt",
+ "test": "grunt test"
},
+ "dependencies": {},
"devDependencies": {
"grunt-contrib-jshint": "~0.1.1",
"grunt-contrib-jasmine": "~0.5.1",
From ecc41f97c1f5ca041dec842d941cc25ceac154fa Mon Sep 17 00:00:00 2001
From: Trent
Date: Wed, 22 Jul 2015 10:03:09 -0400
Subject: [PATCH 8/9] Fix version in package.json
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 2864210..b6474b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "jquery-ui-timepicker-addon",
- "version": "0.0.0-ignored",
+ "version": "1.5.5",
"engines": {
"node": ">= 0.8.0"
},
From 89ac7001c67f7e46bf53847301d4892c1774e13d Mon Sep 17 00:00:00 2001
From: timwiel
Date: Mon, 29 Aug 2016 20:46:33 +1200
Subject: [PATCH 9/9] Update jquery-ui-timepicker-addon.js
---
dist/jquery-ui-timepicker-addon.js | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js
index d37bc02..2240fb6 100644
--- a/dist/jquery-ui-timepicker-addon.js
+++ b/dist/jquery-ui-timepicker-addon.js
@@ -95,6 +95,7 @@
microsecGrid: 0,
alwaysSetTime: true,
separator: ' ',
+ timePortionLocation: 'right',
altFieldTimeOnly: true,
altTimeFormat: null,
altSeparator: null,
@@ -944,7 +945,11 @@
if (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === false) {
formattedDateTime = this.formattedTime;
} else if ((this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) || (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === true)) {
- formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+ if (this._defaults.timePortionLocation === 'left') {
+ formattedDateTime = this.formattedTime + this._defaults.timeSuffix + this._defaults.separator + formattedDateTime;
+ } else {
+ formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+ }
}
this.formattedDateTime = formattedDateTime;
@@ -1983,6 +1988,7 @@
// The idea is to get the number separator occurrences in datetime and the time format requested (since time has
// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
var separator = computeEffectiveSetting(timeSettings, 'separator'),
+ timePortionLocation = computeEffectiveSetting(timeSettings, 'timePortionLocation'),
format = computeEffectiveSetting(timeSettings, 'timeFormat'),
timeParts = format.split(separator), // how many occurrences of separator may be in our format?
timePartsLen = timeParts.length,
@@ -1990,10 +1996,17 @@
allPartsLen = allParts.length;
if (allPartsLen > 1) {
- return {
- dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
- timeString: allParts.splice(0, timePartsLen).join(separator)
- };
+ if (timePortionLocation === 'left') {
+ return {
+ timeString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
+ dateString: allParts.splice(0, timePartsLen).join(separator)
+ };
+ } else {
+ return {
+ dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
+ timeString: allParts.splice(0, timePartsLen).join(separator)
+ };
+ }
}
return {
