moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-14741: cleaning up some leftover cruft

Browse source
This commit is contained in:
scyrma 2008-07-30 07:58:05 +00:00
parent f99442e312
commit cb6c02c4b7
3 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/adminlib.php
View file

@ -2836,7 +2836,7 @@ class admin_setting_special_frontpagedesc extends admin_setting {
} }
function output_html($data, $query='') { function output_html($data, $query='') {
global $CFG, $htmlEditorObject; global $CFG;
$CFG->adminusehtmleditor = can_use_html_editor(); $CFG->adminusehtmleditor = can_use_html_editor();
$return = '<div class="form-htmlarea">'.print_textarea($CFG->adminusehtmleditor, 15, 60, 0, 0, $this->get_full_name(), $data, 0, true, 'summary') .'</div>'; $return = '<div class="form-htmlarea">'.print_textarea($CFG->adminusehtmleditor, 15, 60, 0, 0, $this->get_full_name(), $data, 0, true, 'summary') .'</div>';

2
lib/form/htmleditor.php
View file

@ -61,8 +61,6 @@ class MoodleQuickForm_htmleditor extends MoodleQuickForm_textarea{
function toHtml(){ function toHtml(){
//if ($this->_canUseHtmlEditor && !$this->_flagFrozen){ //if ($this->_canUseHtmlEditor && !$this->_flagFrozen){
//global $htmlEditorObject;
//$script = $htmlEditorObject->activateEditor($this->getName(), $this->getAttribute('id'));
// $script = ''; // $script = '';
//} else { //} else {
// $script=''; // $script='';

2
lib/weblib.php
View file

@ -2544,7 +2544,6 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
$bodytags .= ' class="'.$pageclass.'" id="'.$pageid.'"'; $bodytags .= ' class="'.$pageclass.'" id="'.$pageid.'"';
require_once($CFG->libdir .'/editor/htmlEditor.class.php'); require_once($CFG->libdir .'/editor/htmlEditor.class.php');
global $htmlEditorObject;
$htmlEditorObject = new htmlEditor(); $htmlEditorObject = new htmlEditor();
$htmlEditor = $htmlEditorObject->configure(NULL, $COURSE->id); $htmlEditor = $htmlEditorObject->configure(NULL, $COURSE->id);
@ -4870,7 +4869,6 @@ function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $v
$str .= '</textarea>'."\n"; $str .= '</textarea>'."\n";
if ($usehtmleditor) { if ($usehtmleditor) {
$str_save = "alert('fdsalkjfdsa')";
$str_toggle = '<span class="helplink"><a href="javascript:mce_toggleEditor(\''. $id .'\');"><img width="50" height="17" src="'. $CFG->httpswwwroot .'/lib/editor/tinymce/images/toggle.gif" alt="'. get_string('editortoggle') .'" title="'. get_string('editortoggle') .'" class="icontoggle" /></a></span>'; $str_toggle = '<span class="helplink"><a href="javascript:mce_toggleEditor(\''. $id .'\');"><img width="50" height="17" src="'. $CFG->httpswwwroot .'/lib/editor/tinymce/images/toggle.gif" alt="'. get_string('editortoggle') .'" title="'. get_string('editortoggle') .'" class="icontoggle" /></a></span>';
// Show shortcuts button if HTML editor is in use, but only if JavaScript is enabled (MDL-9556) // Show shortcuts button if HTML editor is in use, but only if JavaScript is enabled (MDL-9556)
$str .= '<div class="textareaicons">'; $str .= '<div class="textareaicons">';