MDL-64554 core_form: Move strings to outputrequirements.lib

moodle · Feb 17, 2021 · 3045005 · 3045005
1 parent 440073f
commit 3045005
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/formslib.php b/lib/formslib.php
@@ -3143,7 +3143,6 @@ function startForm(&$form){
             if (count($this->_collapsibleElements) > 1) {
                 $this->_collapseButtons = $this->_collapseButtonsTemplate;
                 $this->_collapseButtons = str_replace('{strexpandall}', get_string('expandall'), $this->_collapseButtons);
-                $PAGE->requires->strings_for_js(array('collapseall', 'expandall'), 'moodle');
             }
             $PAGE->requires->yui_module('moodle-form-shortforms', 'M.form.shortforms', array(array('formid' => $formid)));
         }

diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
@@ -1684,6 +1684,9 @@ public function get_end_code() {
             'error',
             'file',
             'url',
+            // TODO MDL-70830 shortforms should preload the collapseall/expandall strings properly.
+            'collapseall',
+            'expandall',
         ), 'moodle');
         $this->strings_for_js(array(
             'debuginfo',