mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
javascript MDL-16673 Removed all removeable uses of CFG->javascript
In doing this I was able to eliminate the need for javascript.php files, now removed. I will also be filing several subtasks to clean up the linked to JS files in OUTPUT as well as all instance of the old style of focusing.
This commit is contained in:
parent
e4e7044acd
commit
e11a8328b3
10 changed files with 91 additions and 199 deletions
|
@ -79,11 +79,25 @@
|
|||
/// Based on getDoesGenerate()
|
||||
switch ($xmldb_action->getDoesGenerate()) {
|
||||
case ACTION_GENERATE_HTML:
|
||||
/// Define $CFG->javascript to use our custom javascripts.
|
||||
/// Save the original one to add it from ours. Global too! :-(
|
||||
global $standard_javascript;
|
||||
$standard_javascript = $CFG->javascript; // Save original javascript file
|
||||
$CFG->javascript = $CFG->dirroot.'/'.$CFG->admin.'/xmldb/javascript.php'; //Use our custom javascript code
|
||||
|
||||
$action = optional_param('action', '', PARAM_ALPHAEXT);
|
||||
$postaction = optional_param('postaction', '', PARAM_ALPHAEXT);
|
||||
/// If the js exists, load it
|
||||
if ($action) {
|
||||
$script = $CFG->admin . '/xmldb/actions/' . $action . '/' . $action . '.js';
|
||||
$file = $CFG->dirroot . '/' . $script;
|
||||
if (file_exists($file) && is_readable($file)) {
|
||||
$PAGE->requires->js($script);
|
||||
} else if ($postaction) {
|
||||
/// Try to load the postaction javascript if exists
|
||||
$script = $CFG->admin . '/xmldb/actions/' . $postaction . '/' . $postaction . '.js';
|
||||
$file = $CFG->dirroot . '/' . $script;
|
||||
if (file_exists($file) && is_readable($file)) {
|
||||
$PAGE->requires->js($script);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Go with standard admin header
|
||||
admin_externalpage_print_header();
|
||||
print_heading($xmldb_action->getTitle());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue