From 005cefc0c10bef34c2f1b70f38de560c6b403a11 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 31 Aug 2015 15:53:01 +0800 Subject: [PATCH] Roo/bootstrap/DateField.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/DateField.js | 2 +- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Roo/bootstrap/DateField.js b/Roo/bootstrap/DateField.js index 15be97983c..c13e81fd0b 100644 --- a/Roo/bootstrap/DateField.js +++ b/Roo/bootstrap/DateField.js @@ -262,7 +262,7 @@ Roo.extend(Roo.bootstrap.DateField, Roo.bootstrap.Input, { fillMonths: function() { - var i = 0 + var i = 0; var months = this.picker().select('>.datepicker-months td', true).first(); months.dom.innerHTML = ''; diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 753f0e2a22..bc435dbd7b 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -14833,7 +14833,7 @@ Roo.extend(Roo.bootstrap.DateField, Roo.bootstrap.Input, { fillMonths: function() { - var i = 0 + var i = 0; var months = this.picker().select('>.datepicker-months td', true).first(); months.dom.innerHTML = ''; diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 3db5c4f446..4ff7f0ed8e 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -333,8 +333,8 @@ v.hide();});Roo.each(this.picker().select('tbody > tr > td',true).elements,funct Roo.each(this.picker().select('tfoot th.today',true).elements,function(v){if(!this.calendarWeeks){v.remove();return;} v.dom.innerHTML=Roo.bootstrap.DateField.dates[this.language].today;v.attr('colspan',function(i,B){return parseInt(B)+1;});}) this.weekEnd=this.weekStart===0?6:this.weekStart-1;this.setStartDate(this.startDate);this.setEndDate(this.endDate);this.setDaysOfWeekDisabled(this.daysOfWeekDisabled);this.fillDow();this.fillMonths();this.update();this.showMode();if(this.isInline){this.show();}},picker:function(){return this.pickerEl;},fillDow:function(){var A=this.weekStart;var B={tag:'tr',cn:[]};if(this.calendarWeeks){B.cn.push({tag:'th',cls:'cw',html:' '})}while(A.datepicker-days thead',true).first().createChild(B);},fillMonths:function(){var i=0var months=this.picker().select('>.datepicker-months td',true).first();months.dom.innerHTML='';while(i<12){var A={tag:'span',cls:'month',html:Roo.bootstrap.DateField.dates[this.language].monthsShort[i++]} -months.createChild(A);}},update:function(){this.date=(typeof(this.date)==='undefined'||((typeof(this.date)==='string')&&!this.date.length))?this.UTCToday():(typeof(this.date)==='string')?this.parseDate(this.date):this.date;if(this.datethis.endDate){this.viewDate=new Date(this.endDate);}else {this.viewDate=new Date(this.date);} +this.picker().select('>.datepicker-days thead',true).first().createChild(B);},fillMonths:function(){var i=0;var A=this.picker().select('>.datepicker-months td',true).first();A.dom.innerHTML='';while(i<12){var B={tag:'span',cls:'month',html:Roo.bootstrap.DateField.dates[this.language].monthsShort[i++]} +A.createChild(B);}},update:function(){this.date=(typeof(this.date)==='undefined'||((typeof(this.date)==='string')&&!this.date.length))?this.UTCToday():(typeof(this.date)==='string')?this.parseDate(this.date):this.date;if(this.datethis.endDate){this.viewDate=new Date(this.endDate);}else {this.viewDate=new Date(this.date);} this.fill();},fill:function(){var d=new Date(this.viewDate),A=d.getUTCFullYear(),B=d.getUTCMonth(),C=this.startDate!==-Infinity?this.startDate.getUTCFullYear():-Infinity,D=this.startDate!==-Infinity?this.startDate.getUTCMonth():-Infinity,E=this.endDate!==Infinity?this.endDate.getUTCFullYear():Infinity,F=this.endDate!==Infinity?this.endDate.getUTCMonth():Infinity,G=this.date&&this.date.valueOf(),H=this.UTCToday();this.picker().select('>.datepicker-days thead th.switch',true).first().dom.innerHTML=Roo.bootstrap.DateField.dates[this.language].months[B]+' '+A;this.updateNavArrows();this.fillMonths();var I=this.UTCDate(A,B-1,28,0,0,0,0),J=I.getDaysInMonth(I.getUTCFullYear(),I.getUTCMonth());I.setUTCDate(J);I.setUTCDate(J-(I.getUTCDay()-this.weekStart+7)%7);var K=new Date(I);K.setUTCDate(K.getUTCDate()+42);K=K.valueOf();var L=false;this.picker().select('>.datepicker-days tbody',true).first().dom.innerHTML='';while(I.valueOf().datepicker-days tbody',true).first().createChild(L);} L={tag:'tr',cn:[]};if(this.calendarWeeks){var ws=new Date(+I+(this.weekStart-I.getUTCDay()-7)%7*864e5),th=new Date(+ws+(7+4-ws.getUTCDay())%7*864e5),N=new Date(+(N=this.UTCDate(th.getUTCFullYear(),0,1))+(7+4-N.getUTCDay())%7*864e5),O=(th-N)/864e5/7+1;L.cn.push({tag:'td',cls:'cw',html:O});}}if(I.getUTCFullYear()A||(I.getUTCFullYear()==A&&I.getUTCMonth()>B)){M+=' new';}if(this.todayHighlight&&I.getUTCFullYear()==H.getFullYear()&&I.getUTCMonth()==H.getMonth()&&I.getUTCDate()==H.getDate()){M+=' today';}if(G&&I.valueOf()===G){M+=' active';}if(I.valueOf()this.endDate||this.daysOfWeekDisabled.indexOf(I.getUTCDay())!==-1){M+=' disabled';} L.cn.push({tag:'td',cls:'day '+M,html:I.getDate()}) -- 2.39.2