summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Vance <steve@vance.com>2013-07-28 14:30:41 -0400
committerStephen Vance <steve@vance.com>2013-07-28 14:30:41 -0400
commit43f30402ed254d61fe64a97c792e5653f237330a (patch)
treea10ab9c5f2381505e4049f02fb15e18ec4116e29
parent361eb77e7ab56d30737d2398d32292fb676be8aa (diff)
downloadjQuery-Timepicker-Addon-43f30402ed254d61fe64a97c792e5653f237330a.zip
jQuery-Timepicker-Addon-43f30402ed254d61fe64a97c792e5653f237330a.tar.gz
jQuery-Timepicker-Addon-43f30402ed254d61fe64a97c792e5653f237330a.tar.bz2
Test the literal handling in formatTime() a little more and fix a warning and a curious behavior.
-rw-r--r--jquery-ui-timepicker-addon.js2
-rw-r--r--test/jquery-ui-timepicker-addon_spec.js4
2 files changed, 4 insertions, 2 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 2297428..b2b3cd5 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -1313,7 +1313,7 @@
case 'tt':
return ampmName.toLowerCase();
default:
- return match.replace(/\'/g, "") || "'";
+ return match.replace(/'/g, "");
}
});
diff --git a/test/jquery-ui-timepicker-addon_spec.js b/test/jquery-ui-timepicker-addon_spec.js
index f2b21dc..10a9f8e 100644
--- a/test/jquery-ui-timepicker-addon_spec.js
+++ b/test/jquery-ui-timepicker-addon_spec.js
@@ -593,7 +593,9 @@ describe('datetimepicker', function() {
expect($.datepicker.formatTime('')).toBe('');
expect($.datepicker.formatTime("'abc'")).toBe('abc');
expect($.datepicker.formatTime('"abc"')).toBe('"abc"');
- expect($.datepicker.formatTime("'")).toBe("'"); // TODO: Why???
+ expect($.datepicker.formatTime("'")).toBe("'");
+ expect($.datepicker.formatTime("''")).toBe("");
+ expect($.datepicker.formatTime("'abc' h 'def'")).toBe('abc 12 def');
});
});
});