MDL-65217 core_form: use uniqie element id in filepicker

NoelDeMartin · Apr 29, 2019 · 54e067d · 54e067d
1 parent 14cdf51
commit 54e067d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/form/filepicker.js b/lib/form/filepicker.js
@@ -8,10 +8,10 @@ M.form_filepicker.callback = function(params) {
     html += '<div class="dndupload-progressbars"></div>';
     M.form_filepicker.Y.one('#file_info_'+params['client_id'] + ' .filepicker-filename').setContent(html);
     //When file is added then set status of global variable to true
-    var elementname = M.core_filepicker.instances[params['client_id']].options.elementname;
-    M.form_filepicker.instances[elementname].fileadded = true;
+    var elementid = M.core_filepicker.instances[params['client_id']].options.elementid;
+    M.form_filepicker.instances[elementid].fileadded = true;
     //generate event to indicate changes which will be used by disable if or validation code
-    M.form_filepicker.Y.one('#id_'+elementname).simulate('change');
+    M.form_filepicker.Y.one('#'+elementid).simulate('change');
 };
 
 /**
@@ -22,8 +22,8 @@ M.form_filepicker.init = function(Y, options) {
     M.form_filepicker.Y = Y;
 
     //For client side validation, initialize file status for this filepicker
-    M.form_filepicker.instances[options.elementname] = {};
-    M.form_filepicker.instances[options.elementname].fileadded = false;
+    M.form_filepicker.instances[options.elementid] = {};
+    M.form_filepicker.instances[options.elementid].fileadded = false;
 
     //Set filepicker callback
     options.formcallback = M.form_filepicker.callback;

diff --git a/lib/form/filepicker.php b/lib/form/filepicker.php
@@ -155,7 +155,7 @@ function toHtml() {
         $args->maxbytes = $this->_options['maxbytes'];
         $args->context = $PAGE->context;
         $args->buttonname = $elname.'choose';
-        $args->elementname = $elname;
+        $args->elementid = $id;
 
         $html = $this->_getTabs();
         $fp = new file_picker($args);