projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whitespace
[roojs1]
/
Roo
/
bootstrap
/
DateField.js
diff --git
a/Roo/bootstrap/DateField.js
b/Roo/bootstrap/DateField.js
index
b134476
..
ba18ac3
100644
(file)
--- a/
Roo/bootstrap/DateField.js
+++ b/
Roo/bootstrap/DateField.js
@@
-450,7
+450,6
@@
Roo.extend(Roo.bootstrap.DateField, Roo.bootstrap.Input, {
}
Roo.each(this.picker().select('>div',true).elements, function(v){
}
Roo.each(this.picker().select('>div',true).elements, function(v){
- Roo.log(v);
v.setVisibilityMode(Roo.Element.DISPLAY).originalDisplay = 'block';
v.hide();
});
v.setVisibilityMode(Roo.Element.DISPLAY).originalDisplay = 'block';
v.hide();
});
@@
-674,7
+673,7
@@
Roo.extend(Roo.bootstrap.DateField, Roo.bootstrap.Input, {
case 18: // alt
break;
default :
case 18: // alt
break;
default :
- this.hide();
+ this.hide
Popup
();
}
},
}
},
@@
-728,7
+727,10
@@
Roo.extend(Roo.bootstrap.DateField, Roo.bootstrap.Input, {
break;
case 'span':
if (className.indexOf('disabled') < 0) {
break;
case 'span':
if (className.indexOf('disabled') < 0) {
- this.viewDate.setUTCDate(1);
+ if (!this.viewDate) {
+ this.viewDate = new Date();
+ }
+ this.viewDate.setUTCDate(1);
if (className.indexOf('month') > -1) {
this.viewDate.setUTCMonth(Roo.bootstrap.DateField.dates[this.language].monthsShort.indexOf(html));
} else {
if (className.indexOf('month') > -1) {
this.viewDate.setUTCMonth(Roo.bootstrap.DateField.dates[this.language].monthsShort.indexOf(html));
} else {
@@
-752,8
+754,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;
//Roo.log(className);
if (className.indexOf('day') > -1 && className.indexOf('disabled') < 0 ){
var day = parseInt(html, 10) || 1;
- var year =
this.viewDate
.getUTCFullYear(),
- month =
this.viewDate
.getUTCMonth();
+ var year =
(this.viewDate || new Date())
.getUTCFullYear(),
+ month =
(this.viewDate || new Date())
.getUTCMonth();
if (className.indexOf('old') > -1) {
if(month === 0 ){
if (className.indexOf('old') > -1) {
if(month === 0 ){
@@
-1084,7
+1086,7
@@
Roo.apply(Roo.bootstrap.DateField, {
template : {
tag: 'div',
template : {
tag: 'div',
- cls: 'datepicker dropdown-menu roo-dynamic',
+ cls: 'datepicker dropdown-menu roo-dynamic
shadow
',
cn: [
{
tag: 'div',
cn: [
{
tag: 'div',