Merge pull request #48 from annisaprida/master

fix broken page (remove unnecessary init range on created) and resolve conflict

Author: dodotdot

src/RangedatePicker.vue

@@ -4,7 +4,7 @@
     <div class="calendar" :class="{'calendar-mobile ': isCompact, 'calendar-right-to-left': isRighttoLeft}" v-if="isOpen">
       <div class="calendar-head" v-if="!isCompact">
         <h2>{{captions.title}}</h2>
-        <i class="close" @click="toggleCalendar()"></i>
+        <i class="close" @click="toggleCalendar()">&times</i>
       </div>
       <div class="calendar-wrap">
         <div class="calendar_month_left" :class="{'calendar-left-mobile': isCompact}" v-if="showMonth">
@@ -132,12 +132,12 @@
   cursor: pointer;
 }
 
-.close::after {
-  content: "❌";
-  font-style: normal;
+.close{
   float: right;
-  padding: 10px;
+  padding: 0 10px;
   margin-top: -35px;
+  font-size: 32px;
+  font-weight: normal;
 }
 
 .calendar ul {

src/js/rangedate-picker.js

@@ -188,7 +188,6 @@ export default {
     }
   },
   created () {
-    this.dateRange = this.initRange || null
     if (this.isCompact) {
       this.isOpen = true
     }
@@ -270,15 +269,15 @@ export default {
       // bound by > 0 and < last day of month
       return result > 0 && result <= endMonthDate ? result : '&nbsp;'
     },
-    getNewDateRange (result, activeMonth) {
+    getNewDateRange (result, activeMonth, activeYear) {
       const newData = {}
       let key = 'start'
       if (!this.isFirstChoice) {
         key = 'end'
       } else {
         newData['end'] = null
       }
-      const resultDate = new Date(this.activeYearStart, activeMonth, result)
+      const resultDate = new Date(activeYear, activeMonth, result)
       if (!this.isFirstChoice && resultDate < this.dateRange.start) {
         this.isFirstChoice = false
         return { start: resultDate }
@@ -291,7 +290,8 @@ export default {
     },
     selectFirstItem (r, i) {
       const result = this.getDayIndexInMonth(r, i, this.startMonthDay) + 1
-      this.dateRange = Object.assign({}, this.dateRange, this.getNewDateRange(result, this.activeMonthStart))
+      this.dateRange = Object.assign({}, this.dateRange, this.getNewDateRange(result, this.activeMonthStart,
+      this.activeYearStart))
       if (this.dateRange.start && this.dateRange.end) {
         this.presetActive = ''
         if (this.isCompact) {
@@ -301,7 +301,8 @@ export default {
     },
     selectSecondItem (r, i) {
       const result = this.getDayIndexInMonth(r, i, this.startNextMonthDay) + 1
-      this.dateRange = Object.assign({}, this.dateRange, this.getNewDateRange(result, this.startNextActiveMonth))
+      this.dateRange = Object.assign({}, this.dateRange, this.getNewDateRange(result, this.startNextActiveMonth,
+      this.activeYearEnd))
       if (this.dateRange.start && this.dateRange.end) {
         this.presetActive = ''
       }