Make today highlight optional

eternicode · eternicode · commit dfb6b6470ad1 · 2012-09-27T14:45:17.000-04:00
diff --git a/README.md b/README.md
@@ -146,6 +146,12 @@ Boolean, "linked".  Default: false
 
 If true or "linked", displays a "Today" button at the bottom of the datepicker to select the current date.  If true, the "Today" button will only move the current date into view; if "linked", the current date will also be selected.
 
+### todayHighlight
+
+Boolean.  Default: false
+
+If true, highlights the current date.
+
 ### keyboardNavigation
 
 Boolean.  Default: true
diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js
@@ -107,6 +107,7 @@
 		}
 
 		this.todayBtn = (options.todayBtn||this.element.data('date-today-btn')||false);
+		this.todayHighlight = (options.todayHighlight||this.element.data('date-today-highlight')||false);
 
 		this.weekStart = ((options.weekStart||this.element.data('date-weekstart')||dates[this.language].weekStart||0) % 7);
 		this.weekEnd = ((this.weekStart + 6) % 7);
@@ -267,7 +268,7 @@
 				} else if (prevMonth.getUTCFullYear() > year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) {
 					clsName += ' new';
 				}
-				if (prevMonth.valueOf() == today) {
+				if (prevMonth.valueOf() == today && this.todayHighlight) {
 					clsName += ' today';
 				}
 				if (prevMonth.valueOf() == currentDate) {
diff --git a/tests/suites/options.js b/tests/suites/options.js
@@ -213,7 +213,7 @@ test('Today Button: "linked" selects today\'s date', function(){
         datesEqual(dp.date, today);
 });
 
-test('Today: today\'s date is highlighted when not active', patch_date(function(Date){
+test('Today Highlight: today\'s date is not highlighted by default', patch_date(function(Date){
     Date.now = UTCDate(2012, 2, 15);
     var input = $('<input />')
                 .appendTo('#qunit-fixture')
@@ -229,6 +229,31 @@ test('Today: today\'s date is highlighted when not active', patch_date(function(
         ok(picker.find('.datepicker-days').is(':visible'), 'Days view visible');
         equal(picker.find('.datepicker-days thead .switch').text(), 'March 2012', 'Title is "March 2012"');
 
+        target = picker.find('.datepicker-days tbody td:contains(15)');
+        ok(!target.hasClass('today'), 'Today is not marked with "today" class');
+        target = picker.find('.datepicker-days tbody td:contains(14)');
+        ok(!target.hasClass('today'), 'Yesterday is not marked with "today" class');
+        target = picker.find('.datepicker-days tbody td:contains(16)');
+        ok(!target.hasClass('today'), 'Tomorrow is not marked with "today" class');
+}));
+
+test('Today Highlight: today\'s date is highlighted when not active', patch_date(function(Date){
+    Date.now = UTCDate(2012, 2, 15);
+    var input = $('<input />')
+                .appendTo('#qunit-fixture')
+                .val('2012-03-05')
+                .datepicker({
+                    format: 'yyyy-mm-dd',
+                    todayHighlight: true
+                }),
+        dp = input.data('datepicker'),
+        picker = dp.picker,
+        target;
+
+        input.focus();
+        ok(picker.find('.datepicker-days').is(':visible'), 'Days view visible');
+        equal(picker.find('.datepicker-days thead .switch').text(), 'March 2012', 'Title is "March 2012"');
+
         target = picker.find('.datepicker-days tbody td:contains(15)');
         ok(target.hasClass('today'), 'Today is marked with "today" class');
         target = picker.find('.datepicker-days tbody td:contains(14)');

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`this.todayBtn = (options.todayBtn\|\|this.element.data('date-today-btn')\|\|false);`
	`110`	`+ this.todayHighlight = (options.todayHighlight\|\|this.element.data('date-today-highlight')\|\|false);`
`110`	`111`
`111`	`112`	`this.weekStart = ((options.weekStart\|\|this.element.data('date-weekstart')\|\|dates[this.language].weekStart\|\|0) % 7);`
`112`	`113`	`this.weekEnd = ((this.weekStart + 6) % 7);`
`@@ -267,7 +268,7 @@`
`267`	`268`	`} else if (prevMonth.getUTCFullYear() > year \|\| (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) {`
`268`	`269`	`clsName += ' new';`
`269`	`270`	`}`
`270`		`- if (prevMonth.valueOf() == today) {`
	`271`	`+ if (prevMonth.valueOf() == today && this.todayHighlight) {`
`271`	`272`	`clsName += ' today';`
`272`	`273`	`}`
`273`	`274`	`if (prevMonth.valueOf() == currentDate) {`