mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

navigation MDL-21503 Dock cleanup in preperation of removing global Y

Browse Source
This commit is contained in:
Sam Hemelryk 2010-02-04 06:51:57 +00:00
parent 7f4e9ef9a4
commit 87bf352d75
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
blocks/dock.js
View File

@ -50,7 +50,8 @@ M.blocks.dock = {
*/
display:{
spacebeforefirstitem: 10, // Space between the top of the dock and the first item
mindisplaywidth: null // Minimum width for the display of dock items
mindisplaywidth: null, // Minimum width for the display of dock items
removeallicon: M.util.image_url('t/dock_to_block', 'moodle')
},
/**
* CSS classes to use with the dock
@ -94,6 +95,10 @@ M.blocks.dock = {
Y.augment(M.blocks.dock, Y.EventTarget, true);
// Re-apply early bindings properly now that we can
M.blocks.dock.apply_binds();
// Check if there is a customisation function
if (typeof(customise_dock_for_theme) === 'function') {
customise_dock_for_theme();
}
},
/**
* Adds a dock item into the dock
@ -129,9 +134,8 @@ M.blocks.dock = {
if (Y.UA.ie > 0 && Y.UA.ie < 7) {
this.node.setStyle('height', this.node.get('winHeight')+'px');
}
var dockcontrol = Y.Node.create('<div class="'+M.blocks.dock.cfg.css.controls+'"></div>');
var removeall = Y.Node.create('<img src="'+M.util.image_url('t/dock_to_block', 'moodle')+'" alt="'+mstr.block.undockall+'" title="'+mstr.block.undockall+'" />');
var removeall = Y.Node.create('<img src="'+this.cfg.display.removeallicon+'" alt="'+mstr.block.undockall+'" title="'+mstr.block.undockall+'" />');
removeall.on('removeall|click', this.remove_all, this);
dockcontrol.appendChild(removeall);
this.node.appendChild(dockcontrol);
@ -160,6 +164,7 @@ M.blocks.dock = {
this.items = [];
this.node.remove();
this.node = null;
Y.one(document.body).removeClass(M.blocks.dock.cfg.css.body);
this.fire('dock:removed');
}
return true;
@ -179,6 +184,7 @@ M.blocks.dock = {
this.items = [];
this.node.remove();
this.node = null;
Y.one(document.body).removeClass(M.blocks.dock.cfg.css.body);
Y.fire('dock:removed');
return true;
},
@ -367,7 +373,7 @@ M.blocks.dock = {
var spacewidth = this.resize_block_space(placeholder);
var blocktitle = Y.Node.getDOMNode(this.cachedcontentnode.one('.title h2')).cloneNode(true);
blocktitle.innerHTML = blocktitle.innerHTML.replace(/(.)/g, "$1<br />");
blocktitle = this.fix_title_orientation(blocktitle);
var commands = this.cachedcontentnode.all('.title .commands');
var blockcommands = Y.Node.create('<div class="commands"></div>');
@ -405,6 +411,10 @@ M.blocks.dock = {
this.skipsetposition = false;
}
},
fix_title_orientation : function(node) {
node.innerHTML = node.innerHTML.replace(/(.)/g, "$1<br />");
return node;
},
/**
* Resizes the space that contained blocks if there were no blocks left in
@ -437,7 +447,13 @@ M.blocks.dock = {
*/
return_to_block : function(dockitem) {
var placeholder = Y.one('#content_placeholder_'+this.id);
this.cachedcontentnode.appendChild(dockitem.contents);
if (this.cachedcontentnode.one('.header')) {
this.cachedcontentnode.one('.header').insert(dockitem.contents, 'after');
} else {
this.cachedcontentnode.insert(dockitem.contents);
}
placeholder.replace(Y.Node.getDOMNode(this.cachedcontentnode));
this.cachedcontentnode = Y.one('#'+this.cachedcontentnode.get('id'));
@ -540,6 +556,7 @@ M.blocks.dock = {
xy:position,
autofillheight:this.cfg.panel.autofillheight});
this.panel.showEvent.subscribe(this.resize_panel, this, true);
this.panel.renderEvent.subscribe(this.resize_panel, this, true);
this.panel.setBody(Y.Node.getDOMNode(this.contents));
this.panel.render(M.blocks.dock.node);
if (this.cfg.display.mindisplaywidth !== null && Y.one(this.panel.body).getStyle('minWidth') == '0px') {
@ -662,6 +679,7 @@ M.blocks.genericblock.prototype.init = M.blocks.dock.abstract
M.blocks.genericblock.prototype.move_to_dock = M.blocks.dock.abstract_block_class.move_to_dock;
M.blocks.genericblock.prototype.resize_block_space = M.blocks.dock.abstract_block_class.resize_block_space;
M.blocks.genericblock.prototype.return_to_block = M.blocks.dock.abstract_block_class.return_to_block;
M.blocks.genericblock.prototype.fix_title_orientation = M.blocks.dock.abstract_block_class.fix_title_orientation;
/**
* This class represents an item in the dock

3
blocks/moodleblock.class.php
View File

@ -578,7 +578,6 @@ class block_base {
function get_required_javascript() {
$this->_initialise_dock();
if ($this->instance_can_be_docked()) {
$this->page->requires->js('/blocks/dock.js');
$this->page->requires->js_object_init(null, 'M.blocks.genericblock', array($this->instance->id), array('blocks_dock'));
user_preference_allow_ajax_update('docked_block_instance_'.$this->instance->id, PARAM_INT);
}
@ -753,7 +752,7 @@ class block_base {
public function _initialise_dock() {
global $CFG;
if (!self::$dockinitialised) {
$this->page->requires->js_module(array('name'=>'blocks_dock', 'fullpath'=>'/blocks/dock.js', 'requires'=>array('base','dom','io','node', 'event-custom')));
$this->page->requires->js_module(array('name'=>'blocks_dock', 'fullpath'=>'/blocks/dock.js', 'requires'=>array('dom','io','node', 'event-custom', 'cookie')));
$this->page->requires->strings_for_js(array('addtodock','undockitem','undockall'), 'block');
self::$dockinitialised = true;
}