L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-28987 Forms Library: Added tinyMCE save for tinymce editor validation

Browse Source
This commit is contained in:
Rajesh Taneja
2011-09-05 12:21:49 +08:00
parent a010bfe63d
commit 6786f79ab4
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/form/editor.php
+16 -2
View File
@@ -86,6 +86,15 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
$this->_options['subdirs'] = $allow;
}
/**
* Checks if editor used is tinymce and is required field
*
* @return true if required field.
*/
function isRequiredTinymce() {
return (isset($this->_options['required_tinymce']) && $this->_options['required_tinymce']);
}
function setHelpButton($_helpbuttonargs, $function='_helpbutton') {
if (!is_array($_helpbuttonargs)) {
$_helpbuttonargs = array($_helpbuttonargs);
@@ -198,16 +207,21 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
$fpoptions['link'] = $link_options;
}
//If editor is required and tinymce, then set required_tinymce option to initalize tinymce validation.
if (($editor instanceof tinymce_texteditor) && !is_null($this->getAttribute('onchange'))) {
$this->_options['required_tinymce'] = true;
}
/// print text area - TODO: add on-the-fly switching, size configuration, etc.
$editor->use_editor($id, $this->_options, $fpoptions);
$rows = empty($this->_attributes['rows']) ? 15 : $this->_attributes['rows'];
$cols = empty($this->_attributes['cols']) ? 80 : $this->_attributes['cols'];
//Apply editor rules is required
//Apply editor validation if required field
$editorrules = '';
if (!is_null($this->getAttribute('onblur')) && !is_null($this->getAttribute('onchange'))) {
$editorrules = 'onblur="'.$this->getAttribute('onblur').'" onchange="'.$this->getAttribute('onchange').'"';
$editorrules = 'onblur="'.$this->getAttribute('onblur').'" onchange="'.$this->getAttribute('onchange').'"';
}
$str .= '<div><textarea id="'.$id.'" name="'.$elname.'[text]" rows="'.$rows.'" cols="'.$cols.'"'.$editorrules.'>';
$str .= s($text);
lib/formslib.php
+3 -6
View File
@@ -1780,12 +1780,9 @@ function qf_errorHandler(element, _qfMsg) {
'/[_\[\]]/',
create_function('$matches', 'return sprintf("_%2x",ord($matches[0]));'),
$elementName);
if ($element->_type == 'editor') {
$tinyjs = "
if (tinyMCE.get('id_{$element->getName()}')) {
tinyMCE.get('id_{$element->getName()}').save();
}";
array_unshift($jsArr, $tinyjs);
//If editor is tinymce then tinymce should save contents before textarea can be validated.
if (($element->_type == 'editor') && $element->isRequiredTinymce()) {
array_unshift($jsArr, "tinyMCE.get('{$element->getAttribute('id')}').save();");
}
$js .= '
function validate_' . $this->_formName . '_' . $escapedElementName . '(element) {