Skip to content

Commit da553ea

Browse files
author
Olivier Giulieri
committed
Bug fixes.
1 parent 7fc484f commit da553ea

File tree

8 files changed

+33
-25
lines changed

8 files changed

+33
-25
lines changed

‎dist/css/demo.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
border-bottom: #366092 solid 1px;
3838
width: 100%;
3939
padding: 2px 5px 2px 10px;
40-
z-index: 3000;
40+
z-index: 300;
4141
}
4242
.evo-header a {
4343
color: #c6d9f0;

‎dist/css/evolutility.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
border-bottom: #366092 solid 1px;
4343
width: 100%;
4444
padding: 2px 5px 2px 10px;
45-
z-index: 3000;
45+
z-index: 300;
4646
}
4747
.evo-header a {
4848
color: #c6d9f0;

‎dist/css/evolutility.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/evolutility.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,18 @@ Evol.UI = {
273273

274274
// --- date formats ---
275275
formatDate: function(d){
276-
var dateParts=d.split('-');
277-
if(dateParts.length>1){
278-
return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
276+
if(!_.isUndefined(d) && d!==null){
277+
var dateParts=d.split('-');
278+
if(dateParts.length>1){
279+
return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
280+
}
279281
}
282+
return '';
280283
},
281284
formatTime: function(d){
282-
if(!_.isUndefined(d) && d!==''){
283-
var timeParts=d.split(':');
284-
var hour=parseInt(timeParts[0],10);
285+
if(!_.isUndefined(d) && d!==null && d!==''){
286+
var timeParts=d.split(':'),
287+
hour=parseInt(timeParts[0],10);
285288
if(hour>12){
286289
return (hour-12)+':'+timeParts[1]+' PM';
287290
}else{
@@ -291,7 +294,7 @@ Evol.UI = {
291294
return '';
292295
},
293296
formatDateTime: function(d){
294-
if(!_.isUndefined(d) && d!==''){
297+
if(!_.isUndefined(d) && d!==null && d!==''){
295298
var dateParts=d.split('T');
296299
if(dateParts.length>1){
297300
return this.formatDate(dateParts[0])+', '+this.formatTime(dateParts[1]);
@@ -523,9 +526,9 @@ Evol.UI.Validation = {
523526
break;
524527
case ft.dec:
525528
case ft.money:
526-
var myRegExp = evoRegEx[fd.type + Evol.i18n.LOCALE];
529+
var myRegExp = evoRegEx[ft.dec + Evol.i18n.LOCALE];
527530
if (myRegExp === null) {
528-
myRegExp = evoRegEx[fd.type + "EN"]; // default to English with "."
531+
myRegExp = evoRegEx[ft.dec + 'EN']; // default to English with "."
529532
}
530533
if (!myRegExp.test(fv))
531534
that.setValidationFlags($f.parent(), labMsg(i18nVal[fd.type]));

‎dist/evolutility.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/ui-validation.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ Evol.UI.Validation = {
126126
break;
127127
case ft.dec:
128128
case ft.money:
129-
var myRegExp = evoRegEx[fd.type + Evol.i18n.LOCALE];
129+
var myRegExp = evoRegEx[ft.dec + Evol.i18n.LOCALE];
130130
if (myRegExp === null) {
131-
myRegExp = evoRegEx[fd.type + "EN"]; // default to English with "."
131+
myRegExp = evoRegEx[ft.dec + 'EN']; // default to English with "."
132132
}
133133
if (!myRegExp.test(fv))
134134
that.setValidationFlags($f.parent(), labMsg(i18nVal[fd.type]));

‎js/ui.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -270,15 +270,18 @@ Evol.UI = {
270270

271271
// --- date formats ---
272272
formatDate: function(d){
273-
var dateParts=d.split('-');
274-
if(dateParts.length>1){
275-
return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
273+
if(!_.isUndefined(d) && d!==null){
274+
var dateParts=d.split('-');
275+
if(dateParts.length>1){
276+
return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
277+
}
276278
}
279+
return '';
277280
},
278281
formatTime: function(d){
279-
if(!_.isUndefined(d) && d!==''){
280-
var timeParts=d.split(':');
281-
var hour=parseInt(timeParts[0],10);
282+
if(!_.isUndefined(d) && d!==null && d!==''){
283+
var timeParts=d.split(':'),
284+
hour=parseInt(timeParts[0],10);
282285
if(hour>12){
283286
return (hour-12)+':'+timeParts[1]+' PM';
284287
}else{
@@ -288,7 +291,7 @@ Evol.UI = {
288291
return '';
289292
},
290293
formatDateTime: function(d){
291-
if(!_.isUndefined(d) && d!==''){
294+
if(!_.isUndefined(d) && d!==null && d!==''){
292295
var dateParts=d.split('T');
293296
if(dateParts.length>1){
294297
return this.formatDate(dateParts[0])+', '+this.formatTime(dateParts[1]);

‎less/header.less‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// https://github.com/evoluteur/evolutility
44
// Copyright (c) 2014, Olivier Giulieri
55

6+
// todo: WILL BE REMOVED LATER FOR BOOTSTRAP
7+
68
/* --- header, navbar, content and footer --- */
79

810
@import "less/variables";
@@ -49,7 +51,7 @@
4951
border-bottom: #366092 solid 1px;
5052
width:100%;
5153
padding:2px 5px 2px 10px;
52-
z-index: 3000;
54+
z-index: 300;
5355
//-webkit-box-shadow: 0 0 12px rgba(0, 0, 0, 0.5);
5456
//-moz-box-shadow: 0 0 12px rgba(0, 0, 0, 0.5);
5557
//box-shadow: 0 0 12px rgba(0, 0, 0, 0.5);

0 commit comments

Comments
 (0)