MDL-50852 formslib: Fixed client-side form validation problem.

This patch fixes the problem of client validation being broken when
shortforms is not enabled. This issue is caused by moodle-core-event
module not being loaded and the broadcast parameter in the
Y.Global.publish set to 2 instead of true.

lib/formslib.php

@@ -2233,9 +2233,11 @@ function validate_' . $this->_formName . '_' . $escapedElementName . '(element,
   ret = validate_' . $this->_formName . '_' . $escapedElementName.'(frm.elements[\''.$elementName.'\'], \''.$escapedElementName.'\') && ret;
   if (!ret && !first_focus) {
     first_focus = true;
-    Y.Global.fire(M.core.globalEvents.FORM_ERROR, {formid: \''. $this->_attributes['id'] .'\',
-                                                   elementid: \'id_error_'.$escapedElementName.'\'});
-    document.getElementById(\'id_error_'.$escapedElementName.'\').focus();
+    Y.use(\'moodle-core-event\', function() {
+        Y.Global.fire(M.core.globalEvents.FORM_ERROR, {formid: \'' . $this->_attributes['id'] . '\',
+                                                       elementid: \'id_error_' . $escapedElementName . '\'});
+        document.getElementById(\'id_error_' . $escapedElementName . '\').focus();
+    });
   }
 ';
 

lib/yui/build/moodle-core-event/moodle-core-event-debug.js

@@ -30,7 +30,7 @@ var LOGNAME = 'moodle-core-event';
  */
 M.core = M.core || {};
 
-M.core.event = {
+M.core.event = M.core.event || {
     /**
      * This event is triggered when a page has added dynamic nodes to a page
      * that should be processed by the filter system. An example is loading
@@ -44,7 +44,7 @@ M.core.event = {
     FILTER_CONTENT_UPDATED: "filter-content-updated"
 };
 
-M.core.globalEvents = {
+M.core.globalEvents = M.core.globalEvents || {
     /**
      * This event is triggered when form has an error
      *
@@ -74,15 +74,17 @@ var eventDefaultConfig = {
 // Publish all the events with a standard config.
 var key;
 for (key in M.core.event) {
-    if (M.core.event.hasOwnProperty(key)) {
+    if (M.core.event.hasOwnProperty(key) && Y.getEvent(M.core.event[key]) === null) {
         Y.publish(M.core.event[key], eventDefaultConfig);
     }
 }
 
-//Publish all the global events.
+// Publish global events.
 for (key in M.core.globalEvents) {
-    if (M.core.globalEvents.hasOwnProperty(key)) {
-        Y.Global.publish(M.core.globalEvents[key], Y.merge(eventDefaultConfig, {broadcast: 2}));
+    // Make sure the key exists and that the event has not yet been published. Otherwise, skip publishing.
+    if (M.core.globalEvents.hasOwnProperty(key) && Y.Global.getEvent(M.core.globalEvents[key]) === null) {
+        Y.Global.publish(M.core.globalEvents[key], Y.merge(eventDefaultConfig, {broadcast: true}));
+        Y.log('Global event published: ' + key, 'debug', LOGNAME);
     }
 }
 

lib/yui/build/moodle-core-event/moodle-core-event.js

@@ -30,7 +30,7 @@ var LOGNAME = 'moodle-core-event';
  */
 M.core = M.core || {};
 
-M.core.event = {
+M.core.event = M.core.event || {
     /**
      * This event is triggered when a page has added dynamic nodes to a page
      * that should be processed by the filter system. An example is loading
@@ -44,7 +44,7 @@ M.core.event = {
     FILTER_CONTENT_UPDATED: "filter-content-updated"
 };
 
-M.core.globalEvents = {
+M.core.globalEvents = M.core.globalEvents || {
     /**
      * This event is triggered when form has an error
      *
@@ -71,15 +71,16 @@ var eventDefaultConfig = {
 // Publish all the events with a standard config.
 var key;
 for (key in M.core.event) {
-    if (M.core.event.hasOwnProperty(key)) {
+    if (M.core.event.hasOwnProperty(key) && Y.getEvent(M.core.event[key]) === null) {
         Y.publish(M.core.event[key], eventDefaultConfig);
     }
 }
 
-//Publish all the global events.
+// Publish global events.
 for (key in M.core.globalEvents) {
-    if (M.core.globalEvents.hasOwnProperty(key)) {
-        Y.Global.publish(M.core.globalEvents[key], Y.merge(eventDefaultConfig, {broadcast: 2}));
+    // Make sure the key exists and that the event has not yet been published. Otherwise, skip publishing.
+    if (M.core.globalEvents.hasOwnProperty(key) && Y.Global.getEvent(M.core.globalEvents[key]) === null) {
+        Y.Global.publish(M.core.globalEvents[key], Y.merge(eventDefaultConfig, {broadcast: true}));
     }
 }
 

lib/yui/src/event/js/event.js

@@ -28,7 +28,7 @@ var LOGNAME = 'moodle-core-event';
  */
 M.core = M.core || {};
 
-M.core.event = {
+M.core.event = M.core.event || {
     /**
      * This event is triggered when a page has added dynamic nodes to a page
      * that should be processed by the filter system. An example is loading
@@ -42,7 +42,7 @@ M.core.event = {
     FILTER_CONTENT_UPDATED: "filter-content-updated"
 };
 
-M.core.globalEvents = {
+M.core.globalEvents = M.core.globalEvents || {
     /**
      * This event is triggered when form has an error
      *
@@ -72,14 +72,16 @@ var eventDefaultConfig = {
 // Publish all the events with a standard config.
 var key;
 for (key in M.core.event) {
-    if (M.core.event.hasOwnProperty(key)) {
+    if (M.core.event.hasOwnProperty(key) && Y.getEvent(M.core.event[key]) === null) {
         Y.publish(M.core.event[key], eventDefaultConfig);
     }
 }
 
-//Publish all the global events.
+// Publish global events.
 for (key in M.core.globalEvents) {
-    if (M.core.globalEvents.hasOwnProperty(key)) {
-        Y.Global.publish(M.core.globalEvents[key], Y.merge(eventDefaultConfig, {broadcast: 2}));
+    // Make sure the key exists and that the event has not yet been published. Otherwise, skip publishing.
+    if (M.core.globalEvents.hasOwnProperty(key) && Y.Global.getEvent(M.core.globalEvents[key]) === null) {
+        Y.Global.publish(M.core.globalEvents[key], Y.merge(eventDefaultConfig, {broadcast: true}));
+        Y.log('Global event published: ' + key, 'debug', LOGNAME);
     }
 }