MDL-8737 - Added a focus() to the generated validation JS, so that if an element...

diff --git a/lib/formslib.php b/lib/formslib.php
index 085cb51d4c5a96d0f6478bff9afe6319068ecf7a..53d8d3f110eac0b51ca5288f563adce75e27e4e2 100644 (file)
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -1118,7 +1118,13 @@ function validate_' . $this->_formName . '_' . $elementName . '(element) {
 }
 ';
             $validateJS .= '
-  ret = validate_' . $this->_formName . '_' . $elementName.'(frm.elements[\''.$elementName.'\']) && ret;';
+  ret = validate_' . $this->_formName . '_' . $elementName.'(frm.elements[\''.$elementName.'\']) && ret;
+  if (!ret && !first_focus) {
+    first_focus = true;
+    frm.elements[\''.$elementName.'\'].focus();
+  }
+';
+  
             // Fix for bug displaying errors for elements in a group
             //unset($element);
             //$element =& $this->getElement($elementName);
@@ -1136,9 +1142,9 @@ function validate_' . $this->_formName . '(frm) {
      return true;
   }
   var ret = true;
-
+    
   var frm = document.getElementById(\''. $this->_attributes['id'] .'\')
-
+  var first_focus = false;
 ' . $validateJS . ';
   return ret;
 }