Merge branch 'MDL-32750' of git://github.com/colchambers/moodle

This commit is contained in:
Sam Hemelryk
2013-01-28 11:57:17 +13:00
7 changed files with 214 additions and 5 deletions
+12 -2
View File
@@ -53,7 +53,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
/** @var array options provided to initalize filepicker */
protected $_options = array('subdirs' => 0, 'maxbytes' => 0, 'maxfiles' => 0, 'changeformat' => 0,
'areamaxbytes' => FILE_AREA_MAX_BYTES_UNLIMITED, 'context' => null, 'noclean' => 0, 'trusttext' => 0,
'return_types' => 7);
'return_types' => 7, 'collapsible' => 0, 'collapsed' => 0);
// $_options['return_types'] = FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE
/** @var array values for editor */
@@ -383,7 +383,17 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
if (!is_null($this->getAttribute('onblur')) && !is_null($this->getAttribute('onchange'))) {
$editorrules = ' onblur="'.htmlspecialchars($this->getAttribute('onblur')).'" onchange="'.htmlspecialchars($this->getAttribute('onchange')).'"';
}
$str .= '<div><textarea id="'.$id.'" name="'.$elname.'[text]" rows="'.$rows.'" cols="'.$cols.'"'.$editorrules.'>';
$str .= '<div><textarea id="'.$id.'" name="'.$elname.'[text]" rows="'.$rows.'" cols="'.$cols.'"';
$classes = array();
if (isset($this->_options['collapsed']) && $this->_options['collapsed']) {
$this->_options['collapsible'] = 1;
$classes[] = 'collapsed';
}
if (isset($this->_options['collapsible']) && $this->_options['collapsible']) {
$classes[] = 'collapsible';
}
$str .= ' class="' . implode(' ', $classes) . '"';
$str .= $editorrules.'>';
$str .= s($text);
$str .= '</textarea></div>';