Release v0.2.2

fengyuanchen · Dec 10, 2015 · 15c0664 · 15c0664
1 parent 8869e9d
commit 15c0664
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Changelog
 
 
+## 0.2.2 (Dec 10, 2015)
+
+- Fixed the issue of options overriding (#15)
+- Fixed the error of next view month
+
+
 ## 0.2.1 (Oct 26, 2015)
 
-- Fixed the error of month picker.
+- Fixed the error of month picker
 
 
 ## 0.2.0 (Oct 18, 2015)

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 > A simple jQuery datepicker plugin.
 
-- [Demo](http://fengyuanchen.github.io/datepicker)
+- [Homepage](http://fengyuanchen.github.io/datepicker)
 
 
 
@@ -11,8 +11,8 @@
 - Supports [options](#options)
 - Supports [methods](#methods)
 - Supports [events](#events)
-- Supports inline
-- Supports mobile
+- Supports inline mode
+- Supports touch (mobile)
 - Cross-browser support
 
 

diff --git a/dist/datepicker.css b/dist/datepicker.css
@@ -1,11 +1,11 @@
 /*!
- * Datepicker v0.2.1
+ * Datepicker v0.2.2
  * https://github.com/fengyuanchen/datepicker
  *
  * Copyright (c) 2014-2015 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2015-10-26T02:21:31.213Z
+ * Date: 2015-12-10T13:37:58.037Z
  */
 .datepicker-container {
   position: fixed;
@@ -27,13 +27,13 @@
   -webkit-tap-highlight-color: transparent;
   -webkit-touch-callout: none;
 }
-.datepicker-container:before,
-  .datepicker-container:after {
+
+.datepicker-container:before, .datepicker-container:after {
   position: absolute;
   display: block;
   width: 0;
   height: 0;
-  content: " "; 
+  content: " ";
   border: 5px solid transparent;
 }
 
@@ -42,7 +42,7 @@
   z-index: 1;
   -webkit-box-sizing: content-box;
      -moz-box-sizing: content-box;
-          box-sizing: content-box; 
+          box-sizing: content-box;
   border: 1px solid #ccc;
   -webkit-box-shadow: 0 3px 6px #ccc;
           box-shadow: 0 3px 6px #ccc;
@@ -56,20 +56,22 @@
 .datepicker-top-right {
   border-top-color: #39f;
 }
-.datepicker-top-left:before,
-  .datepicker-top-left:after,
-  .datepicker-top-right:before,
-  .datepicker-top-right:after {
+
+.datepicker-top-left:before, .datepicker-top-left:after,
+.datepicker-top-right:before,
+.datepicker-top-right:after {
   top: -5px;
   left: 10px;
   border-top: 0;
 }
+
 .datepicker-top-left:before,
-  .datepicker-top-right:before {
+.datepicker-top-right:before {
   border-bottom-color: #39f;
 }
+
 .datepicker-top-left:after,
-  .datepicker-top-right:after {
+.datepicker-top-right:after {
   top: -4px;
   border-bottom-color: #fff;
 }
@@ -78,29 +80,30 @@
 .datepicker-bottom-right {
   border-bottom-color: #39f;
 }
-.datepicker-bottom-left:before,
-  .datepicker-bottom-left:after,
-  .datepicker-bottom-right:before,
-  .datepicker-bottom-right:after {
+
+.datepicker-bottom-left:before, .datepicker-bottom-left:after,
+.datepicker-bottom-right:before,
+.datepicker-bottom-right:after {
   bottom: -5px;
   left: 10px;
   border-bottom: 0;
 }
+
 .datepicker-bottom-left:before,
-  .datepicker-bottom-right:before {
+.datepicker-bottom-right:before {
   border-top-color: #39f;
 }
+
 .datepicker-bottom-left:after,
-  .datepicker-bottom-right:after {
+.datepicker-bottom-right:after {
   bottom: -4px;
   border-top-color: #fff;
 }
 
-.datepicker-top-right:before,
-.datepicker-top-right:after,
+.datepicker-top-right:before, .datepicker-top-right:after,
 .datepicker-bottom-right:before,
 .datepicker-bottom-right:after {
-  right: 10px; 
+  right: 10px;
   left: auto;
 }
 
@@ -116,9 +119,10 @@
 
 .datepicker-panel > ul {
   width: 102%;
-  padding: 0; 
+  padding: 0;
   margin: 0;
 }
+
 .datepicker-panel > ul > li {
   float: left;
   width: 30px;
@@ -127,49 +131,45 @@
   margin: 0;
   text-align: center;
   list-style: none;
-  cursor: pointer; 
+  cursor: pointer;
   background-color: #fff;
 }
+
 .datepicker-panel > ul > li:hover {
   background-color: #eee;
 }
-.datepicker-panel > ul > li.muted,
-    .datepicker-panel > ul > li.muted:hover {
+
+.datepicker-panel > ul > li.muted, .datepicker-panel > ul > li.muted:hover {
   color: #999;
 }
-.datepicker-panel > ul > li.picked,
-    .datepicker-panel > ul > li.picked:hover {
+
+.datepicker-panel > ul > li.picked, .datepicker-panel > ul > li.picked:hover {
   color: #39f;
 }
-.datepicker-panel > ul > li.disabled,
-    .datepicker-panel > ul > li.disabled:hover {
+
+.datepicker-panel > ul > li.disabled, .datepicker-panel > ul > li.disabled:hover {
   color: #ccc;
-  cursor: default; 
+  cursor: default;
   background-color: #fff;
 }
-.datepicker-panel > ul > li[data-view="years prev"],
-    .datepicker-panel > ul > li[data-view="year prev"],
-    .datepicker-panel > ul > li[data-view="month prev"],
-    .datepicker-panel > ul > li[data-view="years next"],
-    .datepicker-panel > ul > li[data-view="year next"],
-    .datepicker-panel > ul > li[data-view="month next"],
-    .datepicker-panel > ul > li[data-view="next"] {
+
+.datepicker-panel > ul > li[data-view="years prev"], .datepicker-panel > ul > li[data-view="year prev"], .datepicker-panel > ul > li[data-view="month prev"], .datepicker-panel > ul > li[data-view="years next"], .datepicker-panel > ul > li[data-view="year next"], .datepicker-panel > ul > li[data-view="month next"], .datepicker-panel > ul > li[data-view="next"] {
   font-size: 18px;
 }
-.datepicker-panel > ul > li[data-view="years current"],
-    .datepicker-panel > ul > li[data-view="year current"],
-    .datepicker-panel > ul > li[data-view="month current"] {
+
+.datepicker-panel > ul > li[data-view="years current"], .datepicker-panel > ul > li[data-view="year current"], .datepicker-panel > ul > li[data-view="month current"] {
   width: 150px;
 }
-.datepicker-panel > ul[data-view="years"] > li,
-  .datepicker-panel > ul[data-view="months"] > li {
+
+.datepicker-panel > ul[data-view="years"] > li, .datepicker-panel > ul[data-view="months"] > li {
   width: 52.5px;
   height: 52.5px;
   line-height: 52.5px;
 }
+
 .datepicker-panel > ul[data-view="week"] > li,
-  .datepicker-panel > ul[data-view="week"] > li:hover {
-  cursor: default; 
+.datepicker-panel > ul[data-view="week"] > li:hover {
+  cursor: default;
   background-color: #fff;
 }
 

diff --git a/dist/datepicker.js b/dist/datepicker.js
@@ -1,11 +1,11 @@
 /*!
- * Datepicker v0.2.1
+ * Datepicker v0.2.2
  * https://github.com/fengyuanchen/datepicker
  *
  * Copyright (c) 2014-2015 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2015-10-26T02:21:30.292Z
+ * Date: 2015-12-10T13:37:57.693Z
  */
 
 (function (factory) {
@@ -154,8 +154,14 @@
   }
 
   function Datepicker(element, options) {
+    options = $.isPlainObject(options) ? options : {};
+
+    if (options.language) {
+      options = $.extend({}, Datepicker.LANGUAGES[options.language], options);
+    }
+
     this.$element = $(element);
-    this.options = $.extend({}, Datepicker.DEFAULTS, $.isPlainObject(options) && options);
+    this.options = $.extend({}, Datepicker.DEFAULTS, options);
     this.isBuilt = false;
     this.isShown = false;
     this.isInput = false;
@@ -170,19 +176,13 @@
   Datepicker.prototype = {
     constructor: Datepicker,
 
-    version: '0.2.1',
-
     init: function () {
       var options = this.options;
       var $this = this.$element;
       var startDate = options.startDate;
       var endDate = options.endDate;
       var date = options.date;
 
-      if (options.language) {
-        $.extend(options, Datepicker.LANGUAGES[options.language]);
-      }
-
       this.$trigger = $(options.trigger || $this);
       this.isInput = $this.is('input') || $this.is('textarea');
       this.isInline = options.inline && (options.container || !this.isInput);
@@ -696,7 +696,7 @@
 
       if (viewMonth === 11) {
         nextViewYear += 1;
-        nextViewYear = 0;
+        nextViewMonth = 0;
       } else {
         nextViewMonth += 1;
       }

diff --git a/dist/datepicker.min.css b/dist/datepicker.min.css