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

MDL-19580 cleanup of require css and js filepicker code

Browse source
This commit is contained in:
skodak 2009-06-24 22:34:29 +00:00
parent b14e77c966
commit ff5fe31160
14 changed files with 169 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/form/editor.php
View file

@ -15,6 +15,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
function MoodleQuickForm_editor($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
global $CFG;
require_once("$CFG->dirroot/repository/lib.php");
$options = (array)$options;
foreach ($options as $name=>$value) {
@ -29,6 +30,9 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
$this->_options['context'] = get_context_instance(CONTEXT_SYSTEM);
}
parent::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
repository_head_setup();
editors_head_setup();
}
function setName($name) {
@ -171,9 +175,9 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
require_once($CFG->dirroot.'/repository/lib.php');
$client_id = uniqid();
$ret = repository_get_client($ctx, $client_id, array('image', 'video', 'media'), '*');
$repojs = repository_get_client($ctx, $client_id, array('image', 'video', 'media'), '*');
$str .= $ret['css'].$ret['js'];
$str .= $repojs;
$str .= <<<EOD
<script type="text/javascript">
id2clientid['$id'] = '$client_id';

8
lib/form/filemanager.php
View file

@ -9,6 +9,7 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
function MoodleQuickForm_filemanager($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
global $CFG;
require_once("$CFG->dirroot/repository/lib.php");
$options = (array)$options;
foreach ($options as $name=>$value) {
@ -20,6 +21,8 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
$this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']);
}
parent::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
repository_head_setup();
}
function setName($name) {
@ -162,15 +165,14 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
}
$client_id = uniqid();
$repo_info = repository_get_client($context, $client_id, $this->_options['filetypes'], $this->_options['returnvalue']);
$repojs = repository_get_client($context, $client_id, $this->_options['filetypes'], $this->_options['returnvalue']);
$html = $this->_get_draftfiles($draftitemid, $client_id);
$accessiblefp = get_string('accessiblefilepicker', 'repository');
$str = $this->_getTabs();
$str .= $html;
$str .= $repo_info['css'];
$str .= $repo_info['js'];
$str .= $repojs;
$str .= <<<EOD
<input value="$draftitemid" name="{$this->_attributes['name']}" type="hidden" />
<a href="###" id="btnadd-{$client_id}" style="display:none" class="btnaddfile" onclick="return callpicker('$id', '$client_id', '$draftitemid')">$straddfile</a>

7
lib/form/filepicker.php
View file

@ -18,6 +18,7 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
function MoodleQuickForm_filepicker($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
global $CFG;
require_once("$CFG->dirroot/repository/lib.php");
$options = (array)$options;
foreach ($options as $name=>$value) {
@ -29,6 +30,8 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
$this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']);
}
parent::HTML_QuickForm_input($elementName, $elementLabel, $attributes);
repository_head_setup();
}
function setHelpButton($helpbuttonargs, $function='helpbutton') {
@ -84,14 +87,14 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
$context = get_context_instance(CONTEXT_COURSE, $COURSE->id);
}
$client_id = uniqid();
$repository_info = repository_get_client($context, $client_id, $this->_options['filetypes'], $this->_options['returnvalue']);
$repojs = repository_get_client($context, $client_id, $this->_options['filetypes'], $this->_options['returnvalue']);
$id = $this->_attributes['id'];
$elname = $this->_attributes['name'];
$str = $this->_getTabs();
$str .= '<input type="hidden" name="'.$elname.'" id="'.$id.'" '.$draftvalue.' />';
$str .= $repository_info['css'].$repository_info['js'];
$str .= $repojs;
$str .= <<<EOD
<a href="#nonjsfp" class="btnaddfile" onclick="return callpicker('$client_id', '$id', '$draftvalue')">$straddfile</a>

2
lib/form/htmleditor.php
View file

@ -36,6 +36,8 @@ class MoodleQuickForm_htmleditor extends MoodleQuickForm_textarea{
$this->_type='textarea';
}
$this->_canUseHtmlEditor = $this->_options['canUseHtmlEditor'];
editors_head_setup();
}
/**
* set html for help button