Two fixes:

* Fix for `$background-hover` default color * Fix for resetting interval to 1 date with combination of `flat:false` and `hide_on_select:true`
nazar-pc · Dec 13, 2014 · e7bb289 · ffuubarbuzz · Apr 29, 2016 · nazar-pc
1 parent 7091098
commit e7bb289
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name"         : "pickmeup",
-	"version"      : "2.5.1",
+	"version"      : "2.6.0",
 	"homepage"     : "https://github.com/nazar-pc/PickMeUp",
 	"authors"      : [
 		"Nazar Mokrynskyi <nazar@mokrynskyi.com>"

diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,9 @@
-2.x.x (Unreleased yet)
+2.6.0 (13 December, 2014)
 * New parameter `$background-hover` added to `scss` style file
 * Fix wrong class on selected months and years (`pmu-today` instead of `pmu-selected`)
+* New `default_date` option
+* Fix for `$background-hover` default color
+* Fix for resetting interval to 1 date with combination of `flat:false` and `hide_on_select:true`
 
 2.5.1 (08 September, 2014)
 * Single mode check if options.date is array (take first element of array) [#35](https://github.com/nazar-pc/PickMeUp/pull/35)

diff --git a/css/pickmeup.css b/css/pickmeup.css
@@ -7,7 +7,7 @@
  * @license		MIT License, see license.txt
  */
 .pickmeup {
-  background: black;
+  background: #000;
   border-radius: 0.4em;
   -moz-box-sizing: content-box;
   box-sizing: content-box;
@@ -23,29 +23,29 @@
     text-align: center;
     width: 15em; }
     .pickmeup .pmu-instance .pmu-button {
-      color: #eeeeee;
+      color: #eee;
       cursor: pointer;
       outline: none;
       text-decoration: none; }
     .pickmeup .pmu-instance .pmu-today {
       background: #17384d;
       color: #88c5eb; }
     .pickmeup .pmu-instance .pmu-button:hover {
-      background: black;
+      background: "transparent";
       color: #88c5eb; }
     .pickmeup .pmu-instance .pmu-not-in-month {
-      color: #666666; }
+      color: #666; }
     .pickmeup .pmu-instance .pmu-disabled,
     .pickmeup .pmu-instance .pmu-disabled:hover {
-      color: #333333;
+      color: #333;
       cursor: default; }
     .pickmeup .pmu-instance .pmu-selected {
       background: #136a9f;
-      color: #eeeeee; }
+      color: #eee; }
     .pickmeup .pmu-instance .pmu-not-in-month.pmu-selected {
       background: #17384d; }
     .pickmeup .pmu-instance nav {
-      color: #eeeeee;
+      color: #eee;
       display: -ms-flexbox;
       display: -webkit-flex;
       display: flex;
@@ -65,7 +65,7 @@
       line-height: 3.6em;
       width: 3.5em; }
     .pickmeup .pmu-instance .pmu-day-of-week {
-      color: #999999;
+      color: #999;
       cursor: default; }
     .pickmeup .pmu-instance .pmu-day-of-week *,
     .pickmeup .pmu-instance .pmu-days * {

diff --git a/css/pickmeup.scss b/css/pickmeup.scss
@@ -9,7 +9,7 @@
 $border-radius						: .4em;
 $background							: #000;
 $color								: #eee;
-$background-hover					: $background;
+$background-hover					: 'transparent';
 $color-hover						: #88c5eb;
 $nav-color							: $color;
 $nav-color-hover					: $color-hover;

diff --git a/js/demo.js b/js/demo.js
@@ -23,6 +23,7 @@ $(function () {
 	});
 	$('input').pickmeup({
 		position		: 'right',
-		hide_on_select	: true
+		hide_on_select	: true,
+		mode:'range'
 	});
 });
diff --git a/js/jquery.pickmeup.js b/js/jquery.pickmeup.js
@@ -43,7 +43,7 @@
 	var instances_count	= 0;
 	$.pickmeup = $.extend($.pickmeup || {}, {
 		date			: new Date,
-		default_date		: new Date,
+		default_date	: new Date,
 		flat			: false,
 		first_day		: 1,
 		prev			: '&#9664;',
@@ -777,7 +777,6 @@
 				$(document)
 					.off('mousedown', options.binded.hide)
 					.off('resize', options.binded.forced_show);
-				options.date[1]	= options.date[0];
 				options.lastSel	= false;
 			}
 		}

diff --git a/js/jquery.pickmeup.min.js b/js/jquery.pickmeup.min.js
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
 		"date",
 		"calendar"
 	],
-	"version"      : "2.5.1",
+	"version"      : "2.6.0",
 	"homepage"     : "https://github.com/nazar-pc/PickMeUp",
 	"author"       : {
 		"name"  : "Nazar Mokrynskyi",

diff --git a/pickmeup.jquery.json b/pickmeup.jquery.json
@@ -7,7 +7,7 @@
 		"date",
 		"calendar"
 	],
-	"version"      : "2.5.1",
+	"version"      : "2.6.0",
 	"homepage"     : "https://github.com/nazar-pc/PickMeUp",
 	"author"       : {
 		"name"  : "Nazar Mokrynskyi",

diff --git a/readme.md b/readme.md
@@ -59,12 +59,13 @@ All options and events are the same.
 | Option          | Value                 | Default          | Description                                                                                                 |
 |-----------------|-----------------------|------------------|-------------------------------------------------------------------------------------------------------------|
 | date            | array/object/string   | new Date         | Selected date after initialization. Can be single date string/object or array depending on selection mode   |
+| default_date    | array/object/string   | new Date         | Allows to keep empty value until date selected, but open PickMeUp at this default date                      |
 | flat            | boolean               | false            | Whatever if the date picker is appended to the element or triggered by an event                             |
 | first_day       | 0/1                   | 1                | First day of week: 0 - Sunday, 1 - Monday                                                                   |
 | prev            | string                | &#9664;          | Previous button content                                                                                     |
 | next            | string                | &#9654;          | Next button content                                                                                         |
 | mode            | single/multiple/range | single           | Date selection mode                                                                                         |
-| select_day      | boolean               | true             | Allow or deny days selection                                                                              |
+| select_day      | boolean               | true             | Allow or deny days selection                                                                                |
 | select_month    | boolean               | true             | Allow or deny months selection                                                                              |
 | select_year     | boolean               | true             | Allow or deny year selection                                                                                |
 | view            | days/months/years     | days             | View mode after initialization                                                                              |