v18.4.35 is released

Author: pipeline

controls/buttons/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## [Unreleased]
 
-## 18.4.34 (2021-01-12)
+## 18.4.35 (2021-01-19)
 
 ### CheckBox
 

controls/calendars/dist/ej2-calendars.umd.min.js

@@ -675,8 +675,11 @@ let CalendarBase = class CalendarBase extends Component {
             let weekEle = this.createElement('td', { className: CELL });
             let weekAnchor = this.createElement('span');
             if (day % 7 === 0 && this.weekNumber) {
-                let lastDate = new Date(localDate.getFullYear(), localDate.getMonth(), (localDate.getDate() + 6));
-                weekAnchor.textContent = '' + this.getWeek(lastDate);
+                let numberOfDays;
+                // 6 days are added to get Last day of the week and 3 days are added to get middle day of the week.
+                numberOfDays = this.weekRule === 'FirstDay' ? 6 : (this.weekRule === 'FirstFourDayWeek' ? 3 : 0);
+                let finalDate = new Date(localDate.getFullYear(), localDate.getMonth(), (localDate.getDate() + numberOfDays));
+                weekAnchor.textContent = '' + this.getWeek(finalDate);
                 weekEle.appendChild(weekAnchor);
                 addClass([weekEle], '' + WEEKNUMBER);
                 tdEles.push(weekEle);
@@ -1201,6 +1204,7 @@ let CalendarBase = class CalendarBase extends Component {
                 case 'depth':
                 case 'weekNumber':
                 case 'firstDayOfWeek':
+                case 'weekRule':
                     this.checkView();
                     this.createContentHeader();
                     this.createContentBody();
@@ -1887,6 +1891,9 @@ __decorate([
 __decorate([
     Property(false)
 ], CalendarBase.prototype, "weekNumber", void 0);
+__decorate([
+    Property('FirstDay')
+], CalendarBase.prototype, "weekRule", void 0);
 __decorate([
     Property(true)
 ], CalendarBase.prototype, "showTodayButton", void 0);

controls/calendars/dist/ej2-calendars.umd.min.js.map

@@ -692,8 +692,11 @@ var CalendarBase = /** @__PURE__ @class */ (function (_super) {
             var weekEle = this.createElement('td', { className: CELL });
             var weekAnchor = this.createElement('span');
             if (day % 7 === 0 && this.weekNumber) {
-                var lastDate = new Date(localDate.getFullYear(), localDate.getMonth(), (localDate.getDate() + 6));
-                weekAnchor.textContent = '' + this.getWeek(lastDate);
+                var numberOfDays = void 0;
+                // 6 days are added to get Last day of the week and 3 days are added to get middle day of the week.
+                numberOfDays = this.weekRule === 'FirstDay' ? 6 : (this.weekRule === 'FirstFourDayWeek' ? 3 : 0);
+                var finalDate = new Date(localDate.getFullYear(), localDate.getMonth(), (localDate.getDate() + numberOfDays));
+                weekAnchor.textContent = '' + this.getWeek(finalDate);
                 weekEle.appendChild(weekAnchor);
                 addClass([weekEle], '' + WEEKNUMBER);
                 tdEles.push(weekEle);
@@ -1219,6 +1222,7 @@ var CalendarBase = /** @__PURE__ @class */ (function (_super) {
                 case 'depth':
                 case 'weekNumber':
                 case 'firstDayOfWeek':
+                case 'weekRule':
                     this.checkView();
                     this.createContentHeader();
                     this.createContentBody();
@@ -1904,6 +1908,9 @@ var CalendarBase = /** @__PURE__ @class */ (function (_super) {
     __decorate([
         Property(false)
     ], CalendarBase.prototype, "weekNumber", void 0);
+    __decorate([
+        Property('FirstDay')
+    ], CalendarBase.prototype, "weekRule", void 0);
     __decorate([
         Property(true)
     ], CalendarBase.prototype, "showTodayButton", void 0);

controls/calendars/dist/es6/ej2-calendars.es2015.js

@@ -690,8 +690,11 @@ var CalendarBase = /** @class */ (function (_super) {
             var weekEle = this.createElement('td', { className: CELL });
             var weekAnchor = this.createElement('span');
             if (day % 7 === 0 && this.weekNumber) {
-                var lastDate = new Date(localDate.getFullYear(), localDate.getMonth(), (localDate.getDate() + 6));
-                weekAnchor.textContent = '' + this.getWeek(lastDate);
+                var numberOfDays = void 0;
+                // 6 days are added to get Last day of the week and 3 days are added to get middle day of the week.
+                numberOfDays = this.weekRule === 'FirstDay' ? 6 : (this.weekRule === 'FirstFourDayWeek' ? 3 : 0);
+                var finalDate = new Date(localDate.getFullYear(), localDate.getMonth(), (localDate.getDate() + numberOfDays));
+                weekAnchor.textContent = '' + this.getWeek(finalDate);
                 weekEle.appendChild(weekAnchor);
                 sf.base.addClass([weekEle], '' + WEEKNUMBER);
                 tdEles.push(weekEle);
@@ -1217,6 +1220,7 @@ var CalendarBase = /** @class */ (function (_super) {
                 case 'depth':
                 case 'weekNumber':
                 case 'firstDayOfWeek':
+                case 'weekRule':
                     this.checkView();
                     this.createContentHeader();
                     this.createContentBody();
@@ -1902,6 +1906,9 @@ var CalendarBase = /** @class */ (function (_super) {
     __decorate([
         sf.base.Property(false)
     ], CalendarBase.prototype, "weekNumber", void 0);
+    __decorate([
+        sf.base.Property('FirstDay')
+    ], CalendarBase.prototype, "weekRule", void 0);
     __decorate([
         sf.base.Property(true)
     ], CalendarBase.prototype, "showTodayButton", void 0);