From 2b10404e70e1b9a550b29c945a7a8aa639d5d187 Mon Sep 17 00:00:00 2001 From: Joshua Boyd Date: Sun, 4 Dec 2011 23:39:59 -0500 Subject: [PATCH 1/3] Add umdjs boilerplate to make this jquery plugin support the AMD API. --- jquery.timePicker.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) mode change 100644 => 100755 jquery.timePicker.js diff --git a/jquery.timePicker.js b/jquery.timePicker.js old mode 100644 new mode 100755 index 41b35c1..e15ed13 --- a/jquery.timePicker.js +++ b/jquery.timePicker.js @@ -18,6 +18,15 @@ * show24Hours: use a 24-hour scheme */ +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery'], factory); + } else { + // Browser globals + factory(jQuery); + } +} (function($){ $.fn.timePicker = function(options) { // Build main options before element iteration @@ -274,4 +283,4 @@ return time; } -})(jQuery); +})); From bf47b19c3ee95811a78aac241946972fa932869c Mon Sep 17 00:00:00 2001 From: Joshua Boyd Date: Tue, 13 Dec 2011 18:18:05 -0500 Subject: [PATCH 2/3] Be consistant with $ and jQuery usage. --- jquery.timePicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.timePicker.js b/jquery.timePicker.js index e15ed13..8e62609 100755 --- a/jquery.timePicker.js +++ b/jquery.timePicker.js @@ -39,7 +39,7 @@ $.timePicker = function (elm, settings) { var e = $(elm)[0]; - return e.timePicker || (e.timePicker = new jQuery._timePicker(e, settings)); + return e.timePicker || (e.timePicker = new $._timePicker(e, settings)); }; $.timePicker.version = '0.3'; From 3618090530f5310e3f7762cdcde13b58458cf0d2 Mon Sep 17 00:00:00 2001 From: Joshua Boyd Date: Tue, 13 Dec 2011 18:19:18 -0500 Subject: [PATCH 3/3] Make the leading 0 (zero) on hours configurable. --- jquery.timePicker.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jquery.timePicker.js b/jquery.timePicker.js index 8e62609..e093db7 100755 --- a/jquery.timePicker.js +++ b/jquery.timePicker.js @@ -221,7 +221,8 @@ startTime: new Date(0, 0, 0, 0, 0, 0), endTime: new Date(0, 0, 0, 23, 30, 0), separator: ':', - show24Hours: true + show24Hours: true, + leadingZero: true }; // Private functions. @@ -243,7 +244,8 @@ var h = time.getHours(); var hours = settings.show24Hours ? h : (((h + 11) % 12) + 1); var minutes = time.getMinutes(); - return formatNumber(hours) + settings.separator + formatNumber(minutes) + (settings.show24Hours ? '' : ((h < 12) ? ' AM' : ' PM')); + var hours_str = settings.leadingZero ? formatNumber(hours) : hours; + return hours_str + settings.separator + formatNumber(minutes) + (settings.show24Hours ? '' : ((h < 12) ? ' AM' : ' PM')); } function formatNumber(value) {