From 159840f02b43f14d8721de46b425220af9da6cd8 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Wed, 18 Feb 2009 02:18:06 +0000 Subject: [PATCH] "FORMSLIB,EDITOR/MDL-16698, add filepicker to editor element" --- lib/form/editor.php | 42 ++++++++++++++++++++++++++------------- lib/javascript.php | 1 + repository/javascript.php | 10 ++++++++++ 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/lib/form/editor.php b/lib/form/editor.php index 509b3de298..46afcae474 100644 --- a/lib/form/editor.php +++ b/lib/form/editor.php @@ -2,7 +2,6 @@ require_once('HTML/QuickForm/element.php'); - //TODO: // * locking // * freezing @@ -104,7 +103,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element { } function toHtml() { - global $CFG; + global $CFG, $COURSE; if ($this->_flagFrozen) { return $this->getFrozenHtml(); @@ -178,21 +177,36 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element { $str .= 'Error'; // TODO: localise, fix styles, etc. $str .= ''; - /// TODO: somehow pass 'itemid' to tinymce so that image chooser known where to look for and upload files, - // also include list of expected file types handled by editor array('image', 'video', 'media') - // JS code by Dongsheng goes here - uncomment following block when finished - - /// TODO: hide embedded file manager if tinymce used -/* if ($editorclass === 'form-textarea-advanced') { - $str .= ' +EOD; + + /// TODO: hide embedded file manager if tinymce used + if ($editorclass === 'form-textarea-advanced') { + $str .= << // -'; + +EOD; - }*/ + } } diff --git a/lib/javascript.php b/lib/javascript.php index a691468e36..776392ce4e 100644 --- a/lib/javascript.php +++ b/lib/javascript.php @@ -29,6 +29,7 @@ setTimeout('fix_column_widths()', 20);