Merge branch 'release/2.3.1'

chronotruck · Oct 10, 2019 · 0d65d01 · 0d65d01
2 parents c35c54c + 32330a0
commit 0d65d01
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/docs/css/app.7704e930.css → docs/css/app.916963e2.css b/docs/css/app.7704e930.css → docs/css/app.916963e2.css
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel=icon href=favicon.ico><title>vue-ctk-date-time-picker</title><link href=css/app.7704e930.css rel=preload as=style><link href=js/app.8d1ac218.js rel=preload as=script><link href=js/chunk-vendors.c0d9cd47.js rel=preload as=script><link href=css/app.7704e930.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-ctk-date-time-picker doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d9cd47.js></script><script src=js/app.8d1ac218.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel=icon href=favicon.ico><title>vue-ctk-date-time-picker</title><link href=css/app.916963e2.css rel=preload as=style><link href=js/app.f4fb2928.js rel=preload as=script><link href=js/chunk-vendors.c0d9cd47.js rel=preload as=script><link href=css/app.916963e2.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-ctk-date-time-picker doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d9cd47.js></script><script src=js/app.f4fb2928.js></script></body></html>
diff --git a/docs/js/app.8d1ac218.js b/docs/js/app.8d1ac218.js
diff --git a/docs/js/app.8d1ac218.js.map b/docs/js/app.8d1ac218.js.map
diff --git a/docs/js/app.f4fb2928.js b/docs/js/app.f4fb2928.js
diff --git a/docs/js/app.f4fb2928.js.map b/docs/js/app.f4fb2928.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-ctk-date-time-picker",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "A vue component for select date & time (by Chronotruck)",
   "author": "Louis Mazel <[email protected]>",
   "scripts": {
@@ -69,7 +69,7 @@
     "dist/",
     "nuxt/"
   ],
-  "homepage": "https://chronotruck.github.io/vue-ctk-date-time-picker",
+  "homepage": "https://github.com/chronotruck/vue-ctk-date-time-picker/releases",
   "keywords": [
     "vue",
     "javascript",

diff --git a/src/App.vue b/src/App.vue
@@ -21,7 +21,6 @@
         <h1>CtkDatetimePicker</h1>
         <h3>A VueJs component for select date & time</h3>
         <div
-          v-if="devMode"
           class="container lm-mt-4"
         >
           <a
@@ -31,6 +30,13 @@
           >
             Github
           </a>
+          <a
+            class="lm-btn lm-btn-dark lm-mr-2"
+            target="_blank"
+            href="https://github.com/chronotruck/vue-ctk-date-time-picker/releases"
+          >
+            Changelog
+          </a>
           <a
             class="lm-btn lm-btn-danger"
             target="_blank"

diff --git a/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/TimePicker.vue b/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/TimePicker.vue
@@ -242,7 +242,7 @@
             .map((_, i) => i)
             .filter(m => m >= minEnabledMinute && m <= maxEnabledMinute)
 
-          if (!enabledMinutes.includes(this.minute)) {
+          if (!enabledMinutes.includes(this.minute) && this.behaviour && this.behaviour.time && this.behaviour.time.nearestIfDisabled) {
             this.minute = enabledMinutes[0] // eslint-disable-line
             this.emitValue()
           }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel=icon href=favicon.ico><title>vue-ctk-date-time-picker</title><link href=css/app.7704e930.css rel=preload as=style><link href=js/app.8d1ac218.js rel=preload as=script><link href=js/chunk-vendors.c0d9cd47.js rel=preload as=script><link href=css/app.7704e930.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-ctk-date-time-picker doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d9cd47.js></script><script src=js/app.8d1ac218.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel=icon href=favicon.ico><title>vue-ctk-date-time-picker</title><link href=css/app.916963e2.css rel=preload as=style><link href=js/app.f4fb2928.js rel=preload as=script><link href=js/chunk-vendors.c0d9cd47.js rel=preload as=script><link href=css/app.916963e2.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-ctk-date-time-picker doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d9cd47.js></script><script src=js/app.f4fb2928.js></script></body></html>