mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-14 04:06:39 +02:00
Code Issues Projects Releases Wiki Activity

navigation MDL-25596 Fixed whitespace issue

Browse Source
This commit is contained in:
Sam Hemelryk 2010-12-23 16:55:52 +08:00
parent 48d8d09063
commit 8ad24c1a44
3 changed files with 4 additions and 4 deletions

2
blocks/navigation/block_navigation.php

@ -106,7 +106,7 @@ class block_navigation extends block_base {
$limit = 20;
if (!empty($CFG->navcourselimit)) {
$limit = $CFG->navcourselimit;
}
}
$arguments = array('id'=>$this->instance->id, 'instance'=>$this->instance->id, 'candock'=>$this->instance_can_be_docked(), 'courselimit'=>$limit);
$this->page->requires->yui_module(array('core_dock', 'moodle-block_navigation-navigation'), 'M.block_navigation.init_add_tree', array($arguments));
}

2
blocks/settings/block_settings.php

@ -92,7 +92,7 @@ class block_settings extends block_base {
function get_required_javascript() {
global $CFG;
$arguments = array('id'=>$this->instance->id, 'instance'=>$this->instance->id, 'candock'=>$this->instance_can_be_docked());
$arguments = array('id' => $this->instance->id, 'instance' => $this->instance->id, 'candock' => $this->instance_can_be_docked());
$this->page->requires->yui_module(array('core_dock', 'moodle-block_navigation-navigation'), 'M.block_navigation.init_add_tree', array($arguments));
user_preference_allow_ajax_update('docked_block_instance_'.$this->instance->id, PARAM_INT);
}

4
lib/navigationlib.php

@ -537,10 +537,10 @@ class navigation_node implements renderable {
*/
public function find_expandable(array &$expandable) {
foreach ($this->children as &$child) {
if ($child->nodetype == self::NODETYPE_BRANCH && $child->children->count()==0 && $child->display) {
if ($child->nodetype == self::NODETYPE_BRANCH && $child->children->count() == 0 && $child->display) {
$child->id = 'expandable_branch_'.(count($expandable)+1);
$this->add_class('canexpand');
$expandable[] = array('id'=>$child->id,'key'=>$child->key,'type'=>$child->type);
$expandable[] = array('id' => $child->id, 'key' => $child->key, 'type' => $child->type);
}
$child->find_expandable($expandable);
}