use recursive merge for datepicker options and format

TechnologyAdvice · Mar 18, 2018 · b29aa3a · b29aa3a
1 parent 243544b
commit b29aa3a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/compiled/methods/init-date-filters.js b/compiled/methods/init-date-filters.js
@@ -43,13 +43,13 @@ module.exports = function () {
 
     columnOptions = typeof that.opts.datepickerPerColumnOptions[column] !== 'undefined' ? that.opts.datepickerPerColumnOptions[column] : {};
 
-    columnOptions = merge(columnOptions, {
+    columnOptions = merge.recursive(columnOptions, {
       locale: {
         format: that.dateFormat(column)
       }
     });
 
-    el.daterangepicker(merge(datepickerOptions, columnOptions, range));
+    el.daterangepicker(merge.recursive(datepickerOptions, columnOptions, range));
 
     el.on('apply.daterangepicker', function (ev, picker) {
 

diff --git a/dist/vue-tables-2.min.js b/dist/vue-tables-2.min.js
diff --git a/lib/methods/init-date-filters.js b/lib/methods/init-date-filters.js
@@ -45,13 +45,13 @@ module.exports = function() {
     columnOptions = typeof that.opts.datepickerPerColumnOptions[column]!=='undefined'?
     that.opts.datepickerPerColumnOptions[column]:{};
 
-    columnOptions = merge(columnOptions, {
+    columnOptions = merge.recursive(columnOptions, {
       locale: {
       format: that.dateFormat(column)
       }
     });
 
-    el.daterangepicker(merge(datepickerOptions, columnOptions, range));
+    el.daterangepicker(merge.recursive(datepickerOptions, columnOptions, range));
 
     el.on('apply.daterangepicker', function(ev, picker) {
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue-tables-2",
   "description": "Vue.js 2 grid components",
-  "version": "1.3.83",
+  "version": "1.3.90",
   "keywords": [
     "vue2",
     "vuex",