Bug fixes.

evoluteur · May 7, 2014 · da553ea · da553ea
1 parent 7fc484f
commit da553ea
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 25 deletions.
diff --git a/dist/css/demo.css b/dist/css/demo.css
@@ -37,7 +37,7 @@
   border-bottom: #366092 solid 1px;
   width: 100%;
   padding: 2px 5px 2px 10px;
-  z-index: 3000;
+  z-index: 300;
 }
 .evo-header a {
   color: #c6d9f0;

diff --git a/dist/css/evolutility.css b/dist/css/evolutility.css
@@ -42,7 +42,7 @@
   border-bottom: #366092 solid 1px;
   width: 100%;
   padding: 2px 5px 2px 10px;
-  z-index: 3000;
+  z-index: 300;
 }
 .evo-header a {
   color: #c6d9f0;

diff --git a/dist/css/evolutility.min.css b/dist/css/evolutility.min.css
diff --git a/dist/evolutility.js b/dist/evolutility.js
@@ -273,15 +273,18 @@ Evol.UI = {
 
     // --- date formats ---
     formatDate: function(d){
-        var dateParts=d.split('-');
-        if(dateParts.length>1){
-            return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
+        if(!_.isUndefined(d) && d!==null){
+            var dateParts=d.split('-');
+            if(dateParts.length>1){
+                return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
+            }
         }
+        return '';
     },
     formatTime: function(d){
-        if(!_.isUndefined(d) && d!==''){
-            var timeParts=d.split(':');
-            var hour=parseInt(timeParts[0],10);
+        if(!_.isUndefined(d) && d!==null && d!==''){
+            var timeParts=d.split(':'),
+                hour=parseInt(timeParts[0],10);
             if(hour>12){
                 return (hour-12)+':'+timeParts[1]+' PM';
             }else{
@@ -291,7 +294,7 @@ Evol.UI = {
         return '';
     },
     formatDateTime: function(d){
-        if(!_.isUndefined(d) && d!==''){
+        if(!_.isUndefined(d) && d!==null && d!==''){
             var dateParts=d.split('T');
             if(dateParts.length>1){
                 return this.formatDate(dateParts[0])+', '+this.formatTime(dateParts[1]);
@@ -523,9 +526,9 @@ Evol.UI.Validation = {
                         break;
                     case ft.dec:
                     case ft.money:
-                        var myRegExp = evoRegEx[fd.type + Evol.i18n.LOCALE];
+                        var myRegExp = evoRegEx[ft.dec + Evol.i18n.LOCALE];
                         if (myRegExp === null) {
-                            myRegExp = evoRegEx[fd.type + "EN"]; // default to English with "."
+                            myRegExp = evoRegEx[ft.dec + 'EN']; // default to English with "."
                         }
                         if (!myRegExp.test(fv))
                             that.setValidationFlags($f.parent(), labMsg(i18nVal[fd.type]));

diff --git a/dist/evolutility.min.js b/dist/evolutility.min.js
diff --git a/js/ui-validation.js b/js/ui-validation.js
@@ -126,9 +126,9 @@ Evol.UI.Validation = {
                         break;
                     case ft.dec:
                     case ft.money:
-                        var myRegExp = evoRegEx[fd.type + Evol.i18n.LOCALE];
+                        var myRegExp = evoRegEx[ft.dec + Evol.i18n.LOCALE];
                         if (myRegExp === null) {
-                            myRegExp = evoRegEx[fd.type + "EN"]; // default to English with "."
+                            myRegExp = evoRegEx[ft.dec + 'EN']; // default to English with "."
                         }
                         if (!myRegExp.test(fv))
                             that.setValidationFlags($f.parent(), labMsg(i18nVal[fd.type]));

diff --git a/js/ui.js b/js/ui.js
@@ -270,15 +270,18 @@ Evol.UI = {
 
     // --- date formats ---
     formatDate: function(d){
-        var dateParts=d.split('-');
-        if(dateParts.length>1){
-            return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
+        if(!_.isUndefined(d) && d!==null){
+            var dateParts=d.split('-');
+            if(dateParts.length>1){
+                return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
+            }
         }
+        return '';
     },
     formatTime: function(d){
-        if(!_.isUndefined(d) && d!==''){
-            var timeParts=d.split(':');
-            var hour=parseInt(timeParts[0],10);
+        if(!_.isUndefined(d) && d!==null && d!==''){
+            var timeParts=d.split(':'),
+                hour=parseInt(timeParts[0],10);
             if(hour>12){
                 return (hour-12)+':'+timeParts[1]+' PM';
             }else{
@@ -288,7 +291,7 @@ Evol.UI = {
         return '';
     },
     formatDateTime: function(d){
-        if(!_.isUndefined(d) && d!==''){
+        if(!_.isUndefined(d) && d!==null && d!==''){
             var dateParts=d.split('T');
             if(dateParts.length>1){
                 return this.formatDate(dateParts[0])+', '+this.formatTime(dateParts[1]);

diff --git a/less/header.less b/less/header.less
@@ -3,6 +3,8 @@
 //  https://github.com/evoluteur/evolutility
 //  Copyright (c) 2014, Olivier Giulieri
 
+// todo: WILL BE REMOVED LATER FOR BOOTSTRAP
+
 /* --- header, navbar, content and footer --- */
 
 @import "less/variables";
@@ -49,7 +51,7 @@
   border-bottom: #366092 solid 1px;
   width:100%;
   padding:2px 5px 2px 10px;
-  z-index: 3000;
+  z-index: 300;
   //-webkit-box-shadow: 0 0 12px rgba(0, 0, 0, 0.5);
   //-moz-box-shadow: 0 0 12px rgba(0, 0, 0, 0.5);
   //box-shadow: 0 0 12px rgba(0, 0, 0, 0.5);