Fix noneOption undefined

noneOption now clears input value ('') Closes #622
jonthornton · Nov 20, 2017 · 99f3247 · 99f3247
1 parent ac8b68a
commit 99f3247
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/__tests__/timepicker-test.js b/__tests__/timepicker-test.js
@@ -12,3 +12,14 @@ beforeEach(() => {
 test("timepicker initializes", () => {
   $(`#${TEST_INPUT}`).timepicker();
 });
+
+test("show single string noneOption correctly", () =>{
+  $(`#${TEST_INPUT}`).timepicker({
+    "noneOption": "----"
+  }).timepicker('show');
+
+  $('.ui-timepicker-list li:first-child').trigger('click');
+
+
+  expect($(`#${TEST_INPUT}`).val()).toEqual('');
+});
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jt.timepicker",
-  "version": "1.11.12",
+  "version": "1.11.13",
   "description": "A jQuery timepicker plugin inspired by Google Calendar.",
   "homepage": "http://jonthornton.github.com/jquery-timepicker",
   "main": ["./jquery.timepicker.js", "./jquery.timepicker.css"],

diff --git a/jquery.timepicker.d.ts b/jquery.timepicker.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQuery.timepicker 1.11.12
+// Type definitions for jQuery.timepicker 1.11.13
 // https://github.com/jonthornton/jquery-timepicker
 
 /**

diff --git a/jquery.timepicker.js b/jquery.timepicker.js
@@ -1,5 +1,5 @@
 /*!
- * jquery-timepicker v1.11.12 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
+ * jquery-timepicker v1.11.13 - A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.
  * Copyright (c) 2015 Jon Thornton - http://jonthornton.github.com/jquery-timepicker/
  * License: MIT
  */
@@ -739,6 +739,7 @@
       value = optionValue.value;
     } else if (typeof optionValue == "string") {
       label = optionValue;
+      value = '';
     } else {
       $.error("Invalid noneOption value");
     }

diff --git a/jquery.timepicker.min.js b/jquery.timepicker.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "timepicker",
-  "version": "1.11.12",
+  "version": "1.11.13",
   "title": "jquery-timepicker",
   "author": {
     "name": "Jon Thornton",
@@ -26,9 +26,14 @@
     "prettier-eslint-cli": "^4.3.2"
   },
   "main": "jquery.timepicker.min.js",
-  "description":
-    "A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.",
-  "keywords": ["timepicker", "time", "picker", "ui", "google calendar"],
+  "description": "A jQuery timepicker plugin inspired by Google Calendar. It supports both mouse and keyboard navigation.",
+  "keywords": [
+    "timepicker",
+    "time",
+    "picker",
+    "ui",
+    "google calendar"
+  ],
   "homepage": "http://jonthornton.github.com/jquery-timepicker/",
   "repository": {
     "type": "git",