From 9b38f667bcb44de9b7a2298fa4d262473a2f7c87 Mon Sep 17 00:00:00 2001
From: Alexandre Bulei <alexandre.bulei@centralgest.com>
Date: Thu, 27 Nov 2014 12:55:41 +0000
Subject: [PATCH] Merge the default's settings with user's when array or object

---
 jquery.ui.timepicker.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/jquery.ui.timepicker.js b/jquery.ui.timepicker.js
index 7b4d04d..469a315 100644
--- a/jquery.ui.timepicker.js
+++ b/jquery.ui.timepicker.js
@@ -1080,9 +1080,22 @@
         },
 
         /* Get a setting value, defaulting if necessary. */
-        _get: function (inst, name) {
-            return inst.settings[name] !== undefined ?
-			inst.settings[name] : this._defaults[name];
+        /**
+         * AB Modification
+         * Merge the default's settings with user's when array or object
+         * NOTE: Simply returns the user property when string/integer/other
+        **/
+        _get: function (inst, name) {            
+            var userProp = inst.settings[name];
+            if (userProp !== undefined) {
+                if (($.type(userProp) == 'array') || ($.type(userProp) == 'object')) {
+                    return $.extend(true,this._defaults[name], userProp);
+                } else {
+                    return userProp;
+                }                
+            } else {
+                return  this._defaults[name];
+            }
         },
 
         /* Parse existing time and initialise time picker. */