"MDL-13766, add savepath parameter to html editor when launch filepicker"

diff --git a/lib/editor/tinymce/extra/tinymce_utils.js b/lib/editor/tinymce/extra/tinymce_utils.js
index c73ca822470398ea3081f9345350649c9e5908ab..9565fc68f8eb28700be8839a60fc7d3c0b638e7e 100644 (file)
--- a/lib/editor/tinymce/extra/tinymce_utils.js
+++ b/lib/editor/tinymce/extra/tinymce_utils.js
@@ -54,5 +54,5 @@ function mce_moodlefilemanager(field_name, url, type, win) {
     picker.id = 'file-picker-'+client_id;
     document.body.appendChild(picker);
     var el = win.document.getElementById(field_name);
-    eval('open_filepicker(client_id, {"env":"editor","target":el,"filetype":type})');
+    eval('open_filepicker(client_id, {"env":"editor","target":el,"filetype":type, "savepath":"/"})');
 }

diff --git a/repository/repository.src.js b/repository/repository.src.js
index c20836a90aaef0e5e3f048fe3921ad59c45309e9..fa8cdd599f2fb43887d21b8a862fe4419cefd408 100644 (file)
--- a/repository/repository.src.js
+++ b/repository/repository.src.js
@@ -1236,7 +1236,11 @@ function open_filepicker(id, params) {
         r.target = params.target;
         r.show();
     }
-    r.savepath = params.savepath;
+    if (params.savepath) {
+        r.savepath = params.savepath;
+    } else {
+        r.savepath = params.savepath = '/';
+    }
     if(params.filetype) {
         if(params.filetype == 'image') {
             r.accepted_types = file_extensions.image;