From 9e97e865f5ed1dff854ce9d4a0f7f8b535b266cb Mon Sep 17 00:00:00 2001
From: Nathan Reyes <nathanreyes@me.com>
Date: Wed, 11 Apr 2018 20:44:00 -0500
Subject: [PATCH] Fix missing page parameter in 'update:frompage' and
 'update:topage' events (Closes #125). Rename 'update-on-keyup' prop to
 'update-on-input-keyup'.

---
 CHANGELOG.md                    | 5 ++++-
 src/components/CalendarPane.vue | 2 +-
 src/components/DatePicker.vue   | 6 +++---
 src/utils/defaults.js           | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb89a8cc..33ccb2d84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # v0.9.3
 ## Bug Fixes
+### `v-calendar`
+* Fix bug where initial `update:frompage` and `update:topage` events missing page argument. Closes #125.
+
 ### `v-date-picker`
 * Fix bug where `formats` prop not getting forwarded to `v-calendar`. Closes #123.
 
@@ -9,7 +12,7 @@
 
 ## Improvements
 ### `v-date-picker`
-* Added `update-on-keyup` prop to update picker selection on every `keyup` event.
+* Added `update-on-input-keyup` prop to update picker selection on every `keyup` event.
 * Custom slot method `updateValue` can now accept options as the second parameter. Closes #118.
 
 | Property | Description | Default Value |
diff --git a/src/components/CalendarPane.vue b/src/components/CalendarPane.vue
index 23f3a5b0c..cfee827c6 100755
--- a/src/components/CalendarPane.vue
+++ b/src/components/CalendarPane.vue
@@ -286,7 +286,7 @@ export default {
       this.page_ = this.loadPage(this.page);
     } else {
       this.page_ = this.loadPage(todayComps);
-      this.$emit('update:page');
+      this.$emit('update:page', this.page_);
     }
     this.preloadPages();
   },
diff --git a/src/components/DatePicker.vue b/src/components/DatePicker.vue
index 3c6339ed1..6d9451614 100755
--- a/src/components/DatePicker.vue
+++ b/src/components/DatePicker.vue
@@ -113,9 +113,9 @@ export default {
     availableDates: null,
     formats: Object, // Resolved by computed property
     inputProps: { type: Object, default: () => ({}) }, // Resolved by computed property
-    updateOnKeyup: {
+    updateOnInputKeyup: {
       type: Boolean,
-      default: () => defaults.datePickerUpdateOnKeyup,
+      default: () => defaults.datePickerUpdateOnInputKeyup,
     },
     tintColor: { type: String, default: () => defaults.datePickerTintColor },
     dragAttribute: Object, // Resolved by computed property
@@ -422,7 +422,7 @@ export default {
       });
     },
     inputKeyup(e) {
-      if (e.keyCode !== 13 && this.updateOnKeyup) {
+      if (e.keyCode !== 13 && this.updateOnInputKeyup) {
         this.updateValue(this.inputValue, {
           formatInput: false,
           hidePopover: false,
diff --git a/src/utils/defaults.js b/src/utils/defaults.js
index 547da1024..2b14eefe9 100755
--- a/src/utils/defaults.js
+++ b/src/utils/defaults.js
@@ -41,7 +41,7 @@ const defaults = {
       placeholder: `${format} - ${format}`,
     }),
   }),
-  datePickerUpdateOnKeyup: true,
+  datePickerUpdateOnInputKeyup: true,
   datePickerTintColor: '#66B3CC',
   datePickerShowCaps: false,
   datePickerShowDayPopover: true,