Merge heads

eternicode · eternicode · commit 0c354943d597 · 2012-04-22T12:55:30.000-04:00
diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js
@@ -80,8 +80,8 @@
 				break;
 		}
 
-		this.weekStart = options.weekStart||this.element.data('date-weekstart')||dates[this.language].weekStart||0;
-		this.weekEnd = this.weekStart == 0 ? 6 : this.weekStart - 1;
+		this.weekStart = ((options.weekStart||this.element.data('date-weekstart')||dates[this.language].weekStart||0) % 7);
+		this.weekEnd = ((this.weekStart + 6) % 7);
 		this.startDate = -Infinity;
 		this.endDate = Infinity;
 		this.setStartDate(options.startDate||this.element.data('date-startdate'));
