Changeset 20254 for extensions/Piwecard/js/piwecard.js

Timestamp:

Jan 19, 2013, 12:38:40 AM (11 years ago)

Author:

julien1311

Message:

[piwecard] 2.4.a.b4 version

File:

• extensions/Piwecard/js/piwecard.js (modified) (5 diffs)

extensions/Piwecard/js/piwecard.js

@@ -1 @@
-function piwecard_checkField(element, elementType, nullIsOK) {
+function piwecard_checkField(element, elementType, display, nullIsOK) {
         var TEXT = 0;
         var EMAIL = 1;
         var NUMBER = 2;
         
-        optionalArg = (typeof nullIsOK === "undefined") ? false : nullIsOK;
+        nullIsOK = (typeof nullIsOK === "undefined") ? false : nullIsOK;
+        display = (typeof display === "undefined") ? 'inline' : display;
         
         if (nullIsOK && element.value === '') {
@@ -12 +13 @@
                         case TEXT:
                                 if (element.value == '' || element.className.indexOf("ecard_defaultTextActive") > 0) {
-                                        document.getElementById(element.id+'_error').style.display = 'block';
-                                        element.className += " ecard_error_input";
+                                        add_error_style(element, display);
                                         return false;
                                 } else {
-                                        document.getElementById(element.id+'_error').style.display = 'none';
-                                        element.className = element.className.replace( /(?:^|\s)ecard_error_input(?!\S)/g , '');
+                                        remove_error_style(element);
                                         return true;
                                 }
@@ -24 +23 @@
                                 var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
                                 if (!filter.test(element.value)) {
-                                        document.getElementById(element.id+'_error').style.display = 'block';
-                                        element.className += " ecard_error_input";
+                                        add_error_style(element, display);
                                         return false;
                                 } else {
-                                        document.getElementById(element.id+'_error').style.display = 'none';
-                                        element.className = element.className.replace( /(?:^|\s)ecard_error_input(?!\S)/g , '');
+                                        remove_error_style(element);
                                         return true;
                                 }
@@ -35 +32 @@
                         case NUMBER:
                                 if (element.value == '') {
-                                        document.getElementById(element.id+'_error').style.display = 'inline';
-                                        element.className += " ecard_error_input";
+                                        add_error_style(element, display);
                                         return false;
                                 } else {
                                         if (parseFloat(element.value) % 1 == 0){
+                                                remove_error_style(element);
                                                 return true;
                                         } else {
-                                                document.getElementById(element.id+'_error').style.display = 'inline';
-                                                element.className += " ecard_error_input";
+                                                add_error_style(element, display);
                                                 return false;
                                         }
@@ -54 +50 @@
         }
 }
+
+function add_error_style(element, display) {
+        document.getElementById(element.id+'_error').style.display = display;
+        element.className += " ecard_error_input";
+}
+
+function remove_error_style(element) {
+        document.getElementById(element.id+'_error').style.display = 'none';
+        element.className = element.className.replace( /(?:^|\s)ecard_error_input(?!\S)/g , '');
+}