diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-31 15:07:09 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-31 15:07:09 +0100 |
| commit | 49cb3d8fad124fa6d6dbe341aec8159e52e26fc1 (patch) | |
| tree | 42df9d9dc360aa6b734f660d757bf01d9113b489 /addons/web/static | |
| parent | c50e82c127082f5202cced4bf30bc166bdb9efca (diff) | |
| parent | aeed32d4ffd8529da3c3fbcb091397ca375057f0 (diff) | |
[MERGE] forward port branch saas-11.3 up to aeed32d4ffd
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/lib/tempusdominus/tempusdominus.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/web/static/lib/tempusdominus/tempusdominus.js b/addons/web/static/lib/tempusdominus/tempusdominus.js index a5dac48ac3a..aea7500b571 100644 --- a/addons/web/static/lib/tempusdominus/tempusdominus.js +++ b/addons/web/static/lib/tempusdominus/tempusdominus.js @@ -2093,6 +2093,9 @@ var TempusDominusBootstrap4 = function ($) { } currentDate = this._viewDate.clone().startOf('M').startOf('w').startOf('d'); + // !! ODOO FIX START !! + var now = getMoment(); + // !! ODOO FIX END !! for (i = 0; i < 42; i++) { //always display 42 days (should show 6 weeks) @@ -2125,7 +2128,9 @@ var TempusDominusBootstrap4 = function ($) { if (!this._isValid(currentDate, 'd')) { clsName += ' disabled'; } - if (currentDate.isSame(this.getMoment(), 'd')) { + // !! ODOO FIX START !! + if (currentDate.date() === now.date() && currentDate.month() === now.month() && currentDate.year() === now.year()) { + // !! ODOO FIX END !! clsName += ' today'; } if (currentDate.day() === 0 || currentDate.day() === 6) { |