--- phpMyEdit.class.php	2004-01-14 20:06:29.358232000 +0100
+++ phpMyEdit.class.jsvalid.php	2004-01-14 21:38:04.860376000 +0100
@@ -755,9 +755,6 @@
 				if ($this->displayed[$k] && $this->fdd[$k]['required']
 						&& ! $this->readonly($k) && ! $this->hidden($k)) {
 					$required_ar[] = $k;
-					if (isset($this->fdd[$k]['regex']['js'])) {
-						/* TODO: Use a javascript regex to validate it */
-					}
 				}
 			}
 
@@ -787,9 +784,14 @@
 					if ($this->col_has_values($field_num)) {
 						$condition = 'theForm.%s.selectedIndex == -1';
 						$multiple  = $this->col_has_multiple_select($field_num);
+						$hintmessage = "";
+					} elseif (isset($this->fdd[$field_num]['regex']['js'])) {
+						$condition = $this->fdd[$field_num]['regex']['js'].'.test(phpMyEdit_trim(theForm.%s.value))';
+						$hintmessage = isset($this->fdd[$field_num]['regex']['hint']) ? $this->fdd[$field_num]['regex']['hint'] : "";
 					} else {
 						$condition = 'phpMyEdit_trim(theForm.%s.value) == ""';
 						$multiple  = false;
+						$hintmessage = "";
 					}
 
 					/* Multiple selects have their name like ``name[]''.
@@ -819,7 +821,7 @@
 					} else {
 						echo '
 	if (',sprintf($condition, $this->fds[$field_num]),') {
-		alert("',$this->labels['Please enter'],' ',$this->fdd[$field_num]['name'],'.");';
+		alert("',$this->labels['Please enter'],' ',$this->fdd[$field_num]['name'],'.',$hintmessage,'");';
 						if ($this->tabs_enabled()) {
 							echo '
 		phpMyEdit_show_tab("phpMyEdit_tab"+phpMyEdit_field_to_tab['.$field_num.']);';