Merge pull request #2 from loebi-ch/master

Update to version 2.2.2
loebi-ch · Feb 10, 2018 · 9a1e705 · 9a1e705
2 parents 5bef459 + d7db82b
commit 9a1e705
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -216,6 +216,9 @@ Submit a [GitHub Issues request](https://github.com/loebi-ch/jquery-clock-timepi
 Changelog
 ---------
 
+**Version 2.2.2**  
+- Issue #12 fixed.  
+
 **Version 2.2.1**  
 - Issue #9 perfectionated to select hour/minute part with mouse click.  
 - Parse number settings as integer to prevent errors in calculations in case that a string is passed.  

diff --git a/index.html b/index.html
@@ -39,7 +39,7 @@
  </head>
  <body>
   <div class="main">
-   <h1>jQuery Clock Time Picker v2.2.1</h1>
+   <h1>jQuery Clock Time Picker v2.2.2</h1>
    <h3>NPM package "jquery-clock-timepicker"</h3>
    <p>A free jQuery Plug-in to select the time with a clock inspired by the Android time picker. This plugin works on Desktop and Mobile phones.</p>
    <p>Install with NPM or download it directly from GitHub:<br /><a href="https://github.com/loebi-ch/jquery-clock-timepicker" target="_blank">https://github.com/loebi-ch/jquery-clock-timepicker</a></p>

diff --git a/jquery-clock-timepicker.js b/jquery-clock-timepicker.js
@@ -1,7 +1,7 @@
 /* 
  * Author:  Andreas Loeber
  * Plugin:  jquery-clock-timerpicker
- * Version: 2.2.1
+ * Version: 2.2.2
  */
  (function($) {
 
@@ -10,7 +10,7 @@
 		/************************************************************************************************
 		  DEFAULT SETTINGS (CAN BE OVERRIDDEN WITH THE OPTIONS ARGUMENT)
 		************************************************************************************************/
-		var settings = $.extend({
+		var settings = $.extend(true, {
 			afternoonHoursInOuterCircle: false,
 			autosize: false,
 			colors: {

diff --git a/jquery-clock-timepicker.min.js b/jquery-clock-timepicker.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jquery-clock-timepicker",
-	"version": "2.2.1",
+	"version": "2.2.2",
 	"author": {
 		"name": "Andreas Loeber",
 		"url": "https://github.com/loebi-ch"