fix specs, fix merge conflicts and cleanup

2018-01-22 14:23:05 +01:00 · 2018-01-22 14:23:05 +01:00 · 5426dcf989
commit 5426dcf989
parent d9ff845f63
8 changed files with 36 additions and 17 deletions
--- a/src/components/date-picker/panel/Time/time-range.vue
+++ b/src/components/date-picker/panel/Time/time-range.vue
@ -132,7 +132,7 @@

                // set dateStart
                Object.keys(start).forEach(type => {
-                    dateStart[`set${capitalize(type)}`](start[type])
+                    dateStart[`set${capitalize(type)}`](start[type]);
                });

                // set dateEnd