From 803b23a22f2f471c1d444f1b7c888271ec0a7918 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 11 Feb 2021 14:14:59 +0800 Subject: [PATCH] zindex on combos on popovers.. --- docs/src/Roo_bootstrap_DateField.js.html | 4 ++-- roojs-bootstrap-debug.js | 4 ++-- roojs-bootstrap.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/src/Roo_bootstrap_DateField.js.html b/docs/src/Roo_bootstrap_DateField.js.html index 2317e49bcb..43f2d3f66d 100644 --- a/docs/src/Roo_bootstrap_DateField.js.html +++ b/docs/src/Roo_bootstrap_DateField.js.html @@ -751,8 +751,8 @@ //Roo.log(className); if (className.indexOf('day') > -1 && className.indexOf('disabled') < 0 ){ var day = parseInt(html, 10) || 1; - var year = (new Date(this.viewDate)).getUTCFullYear(), - month = (new Date(this.viewDate)).getUTCMonth(); + var year = (this.viewDate || new Date()).getUTCFullYear(), + month = (this.viewDate || new Date()).getUTCMonth(); if (className.indexOf('old') > -1) { if(month === 0 ){ diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index d571ae007d..12493ad454 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -21580,8 +21580,8 @@ Roo.extend(Roo.bootstrap.DateField, Roo.bootstrap.Input, { //Roo.log(className); if (className.indexOf('day') > -1 && className.indexOf('disabled') < 0 ){ var day = parseInt(html, 10) || 1; - var year = (new Date(this.viewDate)).getUTCFullYear(), - month = (new Date(this.viewDate)).getUTCMonth(); + var year = (this.viewDate || new Date()).getUTCFullYear(), + month = (this.viewDate || new Date()).getUTCMonth(); if (className.indexOf('old') > -1) { if(month === 0 ){ diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index bf79160b82..06c388d2f8 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -905,7 +905,7 @@ this.hidePopup();break;case 16:case 17:case 18:break;default:this.hidePopup();}} var D=A.innerHTML;switch(B.toLowerCase()){case 'th':switch(C){case 'switch':this.showMode(1);break;case 'prev':case 'next':var E=Roo.bootstrap.DateField.modes[this.viewMode].navStep*(C=='prev'?-1:1);switch(this.viewMode){case 0:this.viewDate=this.moveMonth(this.viewDate,E); break;case 1:case 2:this.viewDate=this.moveYear(this.viewDate,E);break;}this.fill();break;case 'today':var F=new Date();this.date=this.UTCDate(F.getFullYear(),F.getMonth(),F.getDate(),0,0,0);this.setValue(this.formatDate(this.date));this.hidePopup();break; }break;case 'span':if(C.indexOf('disabled')<0){this.viewDate.setUTCDate(1);if(C.indexOf('month')>-1){this.viewDate.setUTCMonth(Roo.bootstrap.DateField.dates[this.language].monthsShort.indexOf(D));}else{var G=parseInt(D,10)||0;this.viewDate.setUTCFullYear(G); -}if(this.singleMode){this.setValue(this.formatDate(this.viewDate));this.hidePopup();return;}this.showMode(-1);this.fill();}break;case 'td':if(C.indexOf('day')>-1&&C.indexOf('disabled')<0){var H=parseInt(D,10)||1;var G=(new Date(this.viewDate)).getUTCFullYear(),I=(new Date(this.viewDate)).getUTCMonth(); +}if(this.singleMode){this.setValue(this.formatDate(this.viewDate));this.hidePopup();return;}this.showMode(-1);this.fill();}break;case 'td':if(C.indexOf('day')>-1&&C.indexOf('disabled')<0){var H=parseInt(D,10)||1;var G=(this.viewDate||new Date()).getUTCFullYear(),I=(this.viewDate||new Date()).getUTCMonth(); if(C.indexOf('old')>-1){if(I===0){I=11;G-=1;}else{I-=1;}}else if(C.indexOf('new')>-1){if(I==11){I=0;G+=1;}else{I+=1;}}this.date=this.UTCDate(G,I,H,0,0,0,0);this.viewDate=this.UTCDate(G,I,Math.min(28,H),0,0,0,0);this.setValue(this.formatDate(this.date));this.hidePopup(); }break;}},setStartDate:function(A){this.startDate=A||-Infinity;if(this.startDate!==-Infinity){this.startDate=this.parseDate(this.startDate);}this.update();this.updateNavArrows();},setEndDate:function(A){this.endDate=A||Infinity;if(this.endDate!==Infinity){this.endDate=this.parseDate(this.endDate); }this.update();this.updateNavArrows();},setDaysOfWeekDisabled:function(A){this.daysOfWeekDisabled=A||[];if(typeof(this.daysOfWeekDisabled)!=='object'){this.daysOfWeekDisabled=this.daysOfWeekDisabled.split(/,\s*/);}this.daysOfWeekDisabled=this.daysOfWeekDisabled.map(function(d){return parseInt(d,10); -- 2.39.2