2
0
Эх сурвалжийг харах

disable now button if its range is invalid

Adam Shaw 9 жил өмнө
parent
commit
7171238653

+ 4 - 1
src/Calendar.js

@@ -970,7 +970,10 @@ function Calendar_constructor(element, overrides) {
 	t.updateToolbarButtons = function() {
 	t.updateToolbarButtons = function() {
 		var now = t.getNow();
 		var now = t.getNow();
 
 
-		if (isDateWithinRange(now, currentView.currentRange)) {
+		if (
+			isDateWithinRange(now, currentView.currentRange) ||
+			!currentView.computeDateIsValid(now)
+		) {
 			toolbarsManager.proxyCall('disableButton', 'today');
 			toolbarsManager.proxyCall('disableButton', 'today');
 		}
 		}
 		else {
 		else {

+ 5 - 0
src/common/View.js

@@ -365,6 +365,11 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	},
 	},
 
 
 
 
+	computeDateIsValid: function(date) {
+		return this.resolveRangesForDate(date).isValid;
+	},
+
+
 	trimHiddenDays: function(inputRange) {
 	trimHiddenDays: function(inputRange) {
 		return {
 		return {
 			start: this.skipHiddenDays(inputRange.start),
 			start: this.skipHiddenDays(inputRange.start),