Release v0.5.0

fengyuanchen · Feb 11, 2017 · e6f4de3 · e6f4de3
1 parent c5419e3
commit e6f4de3
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
 
+## 0.5.0 (Feb 11, 2017)
+
+- Added a new option `highlightedClass` for highlight today (#28).
+- Fixed the position of picker panel (#49).
+
+
 ## 0.4.0 (Oct 15, 2016)
 
 - Rename `autoshow` option to `autoShow`.

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@
 dist/
 ├── datepicker.css     ( 4 KB)
 ├── datepicker.min.css ( 4 KB)
-├── datepicker.js      (38 KB)
+├── datepicker.js      (39 KB)
 └── datepicker.min.js  (16 KB)
 ```
 
@@ -330,6 +330,14 @@ A class (CSS) for picked item.
 A class (CSS) for disabled item.
 
 
+### highlightedClass
+
+- Type: `String`
+- Default: `'highlighted'`
+
+A class (CSS) for highlight date item.
+
+
 ### template
 
 - Type: `String`

diff --git a/dist/datepicker.css b/dist/datepicker.css
@@ -1,11 +1,11 @@
 /*!
- * Datepicker v0.4.0
+ * Datepicker v0.5.0
  * https://github.com/fengyuanchen/datepicker
  *
- * Copyright (c) 2014-2016 Fengyuan Chen
+ * Copyright (c) 2014-2017 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2016-10-15T04:28:09.384Z
+ * Date: 2017-02-11T13:41:05.813Z
  */
 .datepicker-container {
   font-size: 12px;
@@ -159,14 +159,22 @@
 }
 
 .datepicker-panel > ul > li:hover {
-  background-color: #eee;
+  background-color: #e6f2ff;
 }
 
 .datepicker-panel > ul > li.muted,
 .datepicker-panel > ul > li.muted:hover {
   color: #999;
 }
 
+.datepicker-panel > ul > li.highlighted {
+  background-color: #e6f2ff;
+}
+
+.datepicker-panel > ul > li.highlighted:hover {
+  background-color: #cce6ff;
+}
+
 .datepicker-panel > ul > li.picked,
 .datepicker-panel > ul > li.picked:hover {
   color: #39f;
@@ -180,6 +188,11 @@
   background-color: #fff;
 }
 
+.datepicker-panel > ul > li.disabled.highlighted,
+.datepicker-panel > ul > li.disabled:hover.highlighted {
+  background-color: #e6f2ff;
+}
+
 .datepicker-panel > ul > li[data-view='years prev'],
 .datepicker-panel > ul > li[data-view='year prev'],
 .datepicker-panel > ul > li[data-view='month prev'],

diff --git a/dist/datepicker.js b/dist/datepicker.js
@@ -1,11 +1,11 @@
 /*!
- * Datepicker v0.4.0
+ * Datepicker v0.5.0
  * https://github.com/fengyuanchen/datepicker
  *
- * Copyright (c) 2014-2016 Fengyuan Chen
+ * Copyright (c) 2014-2017 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2016-10-15T04:28:08.752Z
+ * Date: 2017-02-11T13:41:04.790Z
  */
 
 (function (factory) {
@@ -358,6 +358,7 @@
             if (format.hasYear) {
               this.fillYears();
               $yearsPicker.removeClass(CLASS_HIDE);
+              this.place();
             } else {
               this.showView(0);
             }
@@ -372,6 +373,7 @@
             if (format.hasMonth) {
               this.fillMonths();
               $monthsPicker.removeClass(CLASS_HIDE);
+              this.place();
             } else {
               this.showView(2);
             }
@@ -387,6 +389,7 @@
             if (format.hasDay) {
               this.fillDays();
               $daysPicker.removeClass(CLASS_HIDE);
+              this.place();
             } else {
               this.showView(1);
             }
@@ -452,16 +455,31 @@
             view: '',
             muted: false,
             picked: false,
-            disabled: false
+            disabled: false,
+            highlighted: false
           };
+      var classes = [];
 
       $.extend(defaults, data);
 
+      if (defaults.muted) {
+        classes.push(options.mutedClass);
+      }
+
+      if (defaults.highlighted) {
+        classes.push(options.highlightedClass);
+      }
+
+      if (defaults.picked) {
+        classes.push(options.pickedClass);
+      }
+
+      if (defaults.disabled) {
+        classes.push(options.disabledClass);
+      }
+
       return (
-        '<' + itemTag + ' ' +
-        (defaults.disabled ? 'class="' + options.disabledClass + '"' :
-        defaults.picked ? 'class="' + options.pickedClass + '"' :
-        defaults.muted ? 'class="' + options.mutedClass + '"' : '') +
+        '<' + itemTag + ' class="' + classes.join(' ') + '"' +
         (defaults.view ? ' data-view="' + defaults.view + '"' : '') +
         '>' +
         defaults.text +
@@ -630,6 +648,10 @@
       var prevViewYear = viewYear;
       var prevViewMonth = viewMonth;
       var nextViewYear = viewYear;
+      var now = new Date();
+      var thisYear = now.getFullYear();
+      var thisMonth = now.getMonth();
+      var today = now.getDate();
       var nextViewMonth = viewMonth;
       var date = this.date;
       var year = date.getFullYear();
@@ -692,7 +714,8 @@
           text: i,
           view: 'day prev',
           muted: true,
-          disabled: isDisabled
+          disabled: isDisabled,
+          highlighted: prevViewYear === thisYear && prevViewMonth === thisMonth && date.getDate() === today
         }));
       }
 
@@ -735,7 +758,8 @@
           text: i,
           view: 'day next',
           muted: true,
-          disabled: isDisabled
+          disabled: isDisabled,
+          highlighted: nextViewYear === thisYear && nextViewMonth === thisMonth && date.getDate() === today
         }));
       }
 
@@ -763,7 +787,8 @@
           text: i,
           view: isDisabled ? 'day disabled' : isPicked ? 'day picked' : 'day',
           picked: isPicked,
-          disabled: isDisabled
+          disabled: isDisabled,
+          highlighted: viewYear === thisYear && viewMonth === thisMonth && date.getDate() === today
         }));
       }
 
@@ -1382,6 +1407,9 @@
     // A class (CSS) for disabled date item
     disabledClass: 'disabled',
 
+    // A class (CSS) for highlight date item
+    highlightedClass: 'highlighted',
+
     // The template of the datepicker
     template: (
       '<div class="datepicker-container">' +

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