MDL-23407, the advlink plugin of tinymce should use external reposito…

…ries only
moodle · Jul 27, 2010 · 766514a · 766514a
1 parent 9c954e8
commit 766514a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 15 deletions.
diff --git a/lib/editor/tinymce/module.js b/lib/editor/tinymce/module.js
@@ -51,11 +51,17 @@ M.editor_tinymce.filepicker = function(target_id, url, type, win) {
     YUI(M.yui.loader).use('core_filepicker', function (Y) {
         var editor_id = tinyMCE.selectedInstance.editorId;
         var options = null;
+        alert(type);
         if (type == 'media') {
+            // when mediaw button clicked
             options = M.editor_tinymce.filepicker_options[editor_id]['media'];
-        } else {
+        } else if (type == 'file') {
+            // when link button clicked
+            options = M.editor_tinymce.filepicker_options[editor_id]['link'];
+        } else if (type == 'image') {
+            // when image button clicked
             options = M.editor_tinymce.filepicker_options[editor_id]['image'];
-        }
+        } 
 
         options.formcallback = M.editor_tinymce.filepicker_callback;
         options.editor_target = win.document.getElementById(target_id);

diff --git a/lib/form/editor.php b/lib/form/editor.php
@@ -167,26 +167,33 @@ function toHtml() {
             $args->return_types = (FILE_INTERNAL | FILE_EXTERNAL);
             $args->context = $ctx;
             $args->env = 'filepicker';
-
             $image_options = initialise_filepicker($args);
+            $image_options->context = $ctx;
+            $image_options->client_id = uniqid();
+            $image_options->maxbytes = $this->_options['maxbytes'];
+            $image_options->env = 'editor';
+            $image_options->itemid = $draftitemid;
 
             $args->accepted_types = array('video', 'audio');
             $media_options = initialise_filepicker($args);
-
-            $image_options->context = $ctx;
             $media_options->context = $ctx;
-            $image_options->client_id = uniqid();
             $media_options->client_id = uniqid();
-            $image_options->maxbytes = $this->_options['maxbytes'];
             $media_options->maxbytes  = $this->_options['maxbytes'];
-            $image_options->maxfiles = 1;
-            $media_options->maxfiles = 1;
-            $image_options->env = 'editor';
             $media_options->env = 'editor';
-            $image_options->itemid = $draftitemid;
             $media_options->itemid = $draftitemid;
+
+            $args->return_types = FILE_EXTERNAL;
+            $args->accepted_types = '*';
+            $link_options = initialise_filepicker($args);
+            $link_options->context = $ctx;
+            $link_options->client_id = uniqid();
+            $link_options->maxbytes  = $this->_options['maxbytes'];
+            $link_options->env = 'editor';
+            $link_options->itemid = $draftitemid;
+
             $fpoptions['image'] = $image_options;
             $fpoptions['media'] = $media_options;
+            $fpoptions['link'] = $link_options;
         }
 
     /// print text area - TODO: add on-the-fly switching, size configuration, etc.

diff --git a/repository/filepicker.js b/repository/filepicker.js
@@ -462,7 +462,7 @@ M.core_filepicker.init = function(Y, options) {
                 // support internal files only
                 le_style = ' style="display:none;"';
             }
-            if ((this.options.externallink && this.options.env == 'editor')) {
+            if ((this.options.externallink && this.options.env == 'editor' && this.options.return_types != 1)) {
                 html += '<tr'+le_style+'><td></td><td class="mdl-left"><input type="checkbox" id="linkexternal-'+client_id+'" value="" '+le_checked+' />'+M.str.repository.linkexternal+'</td></tr>';
             }
 
@@ -523,11 +523,19 @@ M.core_filepicker.init = function(Y, options) {
                 if (this.options.env == 'editor') {
                     // in editor, images are stored in '/' only
                     params.savepath = '/';
-                    var linkexternal = Y.one('#linkexternal-'+client_id).get('checked');
-                    if (linkexternal) {
+                    // when image or media button is clicked
+                    if ( this.options.return_types != 1 ) {
+                        var linkexternal = Y.one('#linkexternal-'+client_id).get('checked');
+                        if (linkexternal) {
+                            params['linkexternal'] = 'yes';
+                        }
+                    } else {
+                        // when link button in editor clicked
                         params['linkexternal'] = 'yes';
                     }
-                } if (this.options.env == 'url') {
+                }
+
+                if (this.options.env == 'url') {
                     params['linkexternal'] = 'yes';
                 }
 

diff --git a/repository/lib.php b/repository/lib.php
@@ -1764,6 +1764,7 @@ function initialise_filepicker($args) {
 
     // provided by form element
     $return->accepted_types = $ft->get_extensions($args->accepted_types);
+    $return->return_types = $args->return_types;
     foreach ($repositories as $repository) {
         $meta = $repository->get_meta();
         $return->repositories[$repository->id] = $meta;