From 53fc3e7040fbdd597ae142f65ca2bba86b5df3c8 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Fri, 5 Feb 2010 06:36:09 +0000 Subject: [PATCH] javascript MDL-21503 Removed use of the global Y from dock, navigation and calendar Also included in this patch the ability to switch the dock from the left to right side of the screen. Altered js_object_init to deliver Y like js_init_call does now. Several minor tweaks made to the dock and navigation as well at the same time. --- .../calendar_month/block_calendar_month.php | 1 - blocks/dock.js | 330 ++++++++++-------- .../block_global_navigation_tree.php | 5 +- blocks/global_navigation_tree/navigation.js | 80 ++--- blocks/moodleblock.class.php | 3 +- .../block_settings_navigation_tree.php | 5 +- calendar/calendar.js | 132 ++++--- calendar/event.php | 2 - calendar/lib.php | 4 +- calendar/view.php | 2 - lib/ajax/ajaxlib.php | 4 + lib/outputcomponents.php | 8 +- theme/standardold/config.php | 2 +- theme/standardold/javascript/navigation.js | 91 ++++- theme/standardold/pix/movedock.png | Bin 0 -> 511 bytes theme/standardold/style/styles_layout.css | 7 +- 16 files changed, 386 insertions(+), 290 deletions(-) create mode 100644 theme/standardold/pix/movedock.png diff --git a/blocks/calendar_month/block_calendar_month.php b/blocks/calendar_month/block_calendar_month.php index cb50c2c9a6f..38ef107139e 100644 --- a/blocks/calendar_month/block_calendar_month.php +++ b/blocks/calendar_month/block_calendar_month.php @@ -60,7 +60,6 @@ class block_calendar_month extends block_base { // Be VERY careful with the format for default courses arguments! // Correct formatting is [courseid] => 1 to be concise with moodlelib.php functions. calendar_set_filters($courses, $group, $user, $filtercourse, $groupeventsfrom, false); - $this->page->requires->js_module(array('name'=>'blocks_calendar', 'fullpath'=>'/calendar/calendar.js', 'requires'=>array('dom', 'event', 'node', 'yui2-animation'))); if ($courseshown == SITEID) { // For the front page $this->content->text .= calendar_top_controls('frontpage', array('id' => $courseshown, 'm' => $cal_m, 'y' => $cal_y)); diff --git a/blocks/dock.js b/blocks/dock.js index 433361807b9..4f7578cb2a7 100644 --- a/blocks/dock.js +++ b/blocks/dock.js @@ -1,34 +1,20 @@ -/** - * START OF BLOCKS CODE - * This code can be included in the footer instead of the header if we ever - * have a static JS file that will be loaded in the footer. - * Once this is done we will then also be able to remove the blocks.dock.init - * function and call - */ - -/** - * This namespace will contain all of content (functions, classes, properties) - * for the block system - * @namespace - */ -M.blocks = M.blocks || {}; - /** * The dock namespace: Contains all things dock related * @namespace */ -M.blocks.dock = { - count:0, // The number of dock items currently - totalcount:0, // The number of dock items through the page life - exists:false, // True if the dock exists - items:[], // An array of dock items - node:null, // The YUI node for the dock itself - earlybinds:[], // Events added before the dock was augmented to support events +M.core_dock = { + count : 0, // The number of dock items currently + totalcount : 0, // The number of dock items through the page life + exists : false, // True if the dock exists + items : [], // An array of dock items + node : null, // The YUI node for the dock itself + earlybinds : [], // Events added before the dock was augmented to support events + Y : null, // The YUI instance to use with dock related code /** * Strings used by the dock/dockitems * @namespace */ - strings:{ + strings : { addtodock : '[[addtodock]]', undockitem : '[[undockitem]]', undockall : '[[undockall]]' @@ -89,12 +75,13 @@ M.blocks.dock = { /** * Augments the classes as required and processes early bindings */ - init:function() { + init:function(Y) { + this.Y = Y; // Give the dock item class the event properties/methods - Y.augment(M.blocks.dock.item, Y.EventTarget); - Y.augment(M.blocks.dock, Y.EventTarget, true); + this.Y.augment(M.core_dock.item, this.Y.EventTarget); + this.Y.augment(M.core_dock, this.Y.EventTarget, true); // Re-apply early bindings properly now that we can - M.blocks.dock.apply_binds(); + M.core_dock.apply_binds(); // Check if there is a customisation function if (typeof(customise_dock_for_theme) === 'function') { customise_dock_for_theme(); @@ -103,7 +90,7 @@ M.blocks.dock = { /** * Adds a dock item into the dock * @function - * @param {M.blocks.dock.item} item + * @param {M.core_dock.item} item */ add:function(item) { item.id = this.totalcount; @@ -114,8 +101,22 @@ M.blocks.dock = { this.items[item.id].draw(); this.fire('dock:itemadded', item); }, + /** + * Appends a dock item to the dock + * @param {YUI.Node} docknode + */ append : function(docknode) { - M.blocks.dock.node.one('#dock_item_container').append(docknode); + M.core_dock.node.one('#dock_item_container').append(docknode); + }, + /** + * Initialises a generic block object + * @param {YUI} Y + * @param {int} id + */ + init_genericblock : function(Y, id) { + var genericblock = new this.genericblock(); + genericblock.id = id; + genericblock.init(Y, Y.one('#inst'+id)); }, /** * Draws the dock @@ -127,21 +128,21 @@ M.blocks.dock = { return true; } this.fire('dock:drawstarted'); - this.item_sizer.init(); - this.node = Y.Node.create('
'); - this.node.appendChild(Y.Node.create('
')); - this.node.appendChild(Y.Node.create('
')); - if (Y.UA.ie > 0 && Y.UA.ie < 7) { + this.item_sizer.init(this.Y); + this.node = this.Y.Node.create('
'); + this.node.appendChild(this.Y.Node.create('
')); + this.node.appendChild(this.Y.Node.create('
')); + if (this.Y.UA.ie > 0 && this.Y.UA.ie < 7) { this.node.setStyle('height', this.node.get('winHeight')+'px'); } - var dockcontrol = Y.Node.create('
'); - var removeall = Y.Node.create(''+mstr.block.undockall+''); + var dockcontrol = this.Y.Node.create('
'); + var removeall = this.Y.Node.create(''+mstr.block.undockall+''); removeall.on('removeall|click', this.remove_all, this); dockcontrol.appendChild(removeall); this.node.appendChild(dockcontrol); - Y.one(document.body).appendChild(this.node); - Y.one(document.body).addClass(M.blocks.dock.cfg.css.body); + this.Y.one(document.body).appendChild(this.node); + this.Y.one(document.body).addClass(M.core_dock.cfg.css.body); this.fire('dock:drawcompleted'); return true; }, @@ -164,7 +165,7 @@ M.blocks.dock = { this.items = []; this.node.remove(); this.node = null; - Y.one(document.body).removeClass(M.blocks.dock.cfg.css.body); + this.Y.one(document.body).removeClass(M.core_dock.cfg.css.body); this.fire('dock:removed'); } return true; @@ -180,12 +181,12 @@ M.blocks.dock = { this.count--; delete this.items[i]; } - Y.fire('dock:toberemoved'); + this.Y.fire('dock:toberemoved'); this.items = []; this.node.remove(); this.node = null; - Y.one(document.body).removeClass(M.blocks.dock.cfg.css.body); - Y.fire('dock:removed'); + this.Y.one(document.body).removeClass(M.core_dock.cfg.css.body); + this.Y.fire('dock:removed'); return true; }, /** @@ -232,18 +233,35 @@ M.blocks.dock = { } this.earlybinds = []; }, + /** + * Namespace for the dock sizer which is responsible for ensuring that dock + * items are visible at all times, this is required because otherwise when there + * were enough dock items to fit on the dock those that ran over the size of + * the dock would not be usable + * @namespace + */ item_sizer : { - enabled : false, - init : function() { - M.blocks.dock.on('dock:itemadded', this.check_if_required, this); - M.blocks.dock.on('dock:itemremoved', this.check_if_required, this); - Y.on('windowresize', this.check_if_required, this); + enabled : false, // True if the item_sizer is being used, false otherwise + Y : null, // The YUI instance + /** + * Initialises the dock sizer which then attaches itself to the required + * events in order to monitor the dock + * @param {YUI} Y + */ + init : function(Y) { + this.Y = Y; + M.core_dock.on('dock:itemadded', this.check_if_required, this); + M.core_dock.on('dock:itemremoved', this.check_if_required, this); + this.Y.on('windowresize', this.check_if_required, this); }, + /** + * Check if the size dock items needs to be adjusted + */ check_if_required : function() { - var possibleheight = M.blocks.dock.node.get('offsetHeight') - M.blocks.dock.node.one('.controls').get('offsetHeight') - (M.blocks.dock.cfg.buffer*3) - (M.blocks.dock.items.length*2); + var possibleheight = M.core_dock.node.get('offsetHeight') - M.core_dock.node.one('.controls').get('offsetHeight') - (M.core_dock.cfg.buffer*3) - (M.core_dock.items.length*2); var totalheight = 0; - for (var id in M.blocks.dock.items) { - var dockedtitle = Y.get(M.blocks.dock.items[id].title).ancestor('.'+M.blocks.dock.cfg.css.dockedtitle); + for (var id in M.core_dock.items) { + var dockedtitle = this.Y.get(M.core_dock.items[id].title).ancestor('.'+M.core_dock.cfg.css.dockedtitle); if (dockedtitle) { if (this.enabled) { dockedtitle.setStyle('height', 'auto'); @@ -255,17 +273,20 @@ M.blocks.dock = { this.enable(possibleheight); } }, + /** + * Enables the dock sizer and resizes where required. + */ enable : function(possibleheight) { this.enabled = true; var runningcount = 0; var usedheight = 0; - for (var id in M.blocks.dock.items) { - var itemtitle = Y.get(M.blocks.dock.items[id].title).ancestor('.'+M.blocks.dock.cfg.css.dockedtitle); + for (var id in M.core_dock.items) { + var itemtitle = this.Y.get(M.core_dock.items[id].title).ancestor('.'+M.core_dock.cfg.css.dockedtitle); if (!itemtitle) { continue; } - var itemheight = Math.floor((possibleheight-usedheight) / (M.blocks.dock.count - runningcount)); - Y.log("("+possibleheight+"-"+usedheight+") / ("+M.blocks.dock.count+" - "+runningcount+") = "+itemheight); + var itemheight = Math.floor((possibleheight-usedheight) / (M.core_dock.count - runningcount)); + this.Y.log("("+possibleheight+"-"+usedheight+") / ("+M.core_dock.count+" - "+runningcount+") = "+itemheight); var offsetheight = itemtitle.get('offsetHeight'); itemtitle.setStyle('overflow', 'hidden'); if (offsetheight > itemheight) { @@ -276,7 +297,7 @@ M.blocks.dock = { } runningcount++; } - Y.log('possible: '+possibleheight+' - used height: '+usedheight); + this.Y.log('possible: '+possibleheight+' - used height: '+usedheight); } }, /** @@ -286,6 +307,7 @@ M.blocks.dock = { */ abstract_block_class : { + Y : null, // A YUI instance to use with the block id : null, // The block instance id cachedcontentnode : null, // The cached content node for the actual block blockspacewidth : null, // The width of the block's original container @@ -298,24 +320,23 @@ M.blocks.dock = { * * @param {YUI.Node} node The node that contains all of the block's content */ - init : function(node) { + init : function(Y, node) { + + this.Y = Y; if (!node) { - node = Y.one('#inst'+this.id); - if (!node) { - return; - } + return; } var commands = node.one('.header .title .commands'); if (!commands) { - commands = Y.Node.create('
'); + commands = this.Y.Node.create('
'); if (node.one('.header .title')) { node.one('.header .title').append(commands); } } - var moveto = Y.Node.create(''); - moveto.append(Y.Node.create(''+mstr.block.undockitem+'')); + var moveto = this.Y.Node.create(''); + moveto.append(this.Y.Node.create(''+mstr.block.undockitem+'')); if (location.href.match(/\?/)) { moveto.set('href', location.href+'&dock='+this.id); } else { @@ -347,7 +368,7 @@ M.blocks.dock = { e.halt(true); } - var node = Y.one('#inst'+this.id); + var node = this.Y.one('#inst'+this.id); var blockcontent = node.one('.content'); if (!blockcontent) { return; @@ -356,7 +377,7 @@ M.blocks.dock = { this.cachedcontentnode = node; node.all('a.moveto').each(function(moveto){ - Y.Event.purgeElement(Y.Node.getDOMNode(moveto), false, 'click'); + this.Y.Event.purgeElement(this.Y.Node.getDOMNode(moveto), false, 'click'); if (moveto.hasClass('customcommand')) { moveto.all('img').each(function(movetoimg){ movetoimg.setAttribute('src', M.util.image_url('t/dock_to_block', 'moodle')); @@ -366,24 +387,24 @@ M.blocks.dock = { } }, this); - var placeholder = Y.Node.create('
'); - node.replace(Y.Node.getDOMNode(placeholder)); + var placeholder = this.Y.Node.create('
'); + node.replace(this.Y.Node.getDOMNode(placeholder)); node = null; var spacewidth = this.resize_block_space(placeholder); - var blocktitle = Y.Node.getDOMNode(this.cachedcontentnode.one('.title h2')).cloneNode(true); + var blocktitle = this.Y.Node.getDOMNode(this.cachedcontentnode.one('.title h2')).cloneNode(true); blocktitle = this.fix_title_orientation(blocktitle); var commands = this.cachedcontentnode.all('.title .commands'); - var blockcommands = Y.Node.create('
'); + var blockcommands = this.Y.Node.create('
'); if (commands.size() > 0) { blockcommands = commands.item(0); } // Create a new dock item for the block - var dockitem = new M.blocks.dock.item(this.id, blocktitle, blockcontent, blockcommands); - if (spacewidth !== null && M.blocks.dock.cfg.display.mindisplaywidth == null) { + var dockitem = new M.core_dock.item(this.Y, this.id, blocktitle, blockcontent, blockcommands); + if (spacewidth !== null && M.core_dock.cfg.display.mindisplaywidth == null) { dockitem.cfg.display.mindisplaywidth = spacewidth; } // Wire the draw events to register remove events @@ -391,18 +412,18 @@ M.blocks.dock = { // check the contents block [editing=off] this.contents.all('a.moveto').on('returntoblock|click', function(e){ e.halt(); - M.blocks.dock.remove(this.id) + M.core_dock.remove(this.id) }, this); // check the commands block [editing=on] this.commands.all('a.moveto').on('returntoblock|click', function(e){ e.halt(); - M.blocks.dock.remove(this.id) + M.core_dock.remove(this.id) }, this); }, dockitem); // Register an event so that when it is removed we can put it back as a block dockitem.on('dockitem:itemremoved', this.return_to_block, this, dockitem); - M.blocks.dock.add(dockitem); + M.core_dock.add(dockitem); if (!this.skipsetposition) { // save the users preference @@ -411,11 +432,15 @@ M.blocks.dock = { this.skipsetposition = false; } }, + /** + * Corrects the orientation of the title, which for the default + * dock just means making it vertical + * @param {YUI.Node} node + */ fix_title_orientation : function(node) { node.innerHTML = node.innerHTML.replace(/(.)/g, "$1
"); return node; }, - /** * Resizes the space that contained blocks if there were no blocks left in * it. e.g. if all blocks have been moved to the dock @@ -439,14 +464,13 @@ M.blocks.dock = { } return null; }, - /** * This function removes a block from the dock and puts it back into the page * structure. - * @param {M.blocks.dock.class.item} + * @param {M.core_dock.class.item} */ return_to_block : function(dockitem) { - var placeholder = Y.one('#content_placeholder_'+this.id); + var placeholder = this.Y.one('#content_placeholder_'+this.id); if (this.cachedcontentnode.one('.header')) { this.cachedcontentnode.one('.header').insert(dockitem.contents, 'after'); @@ -454,13 +478,13 @@ M.blocks.dock = { this.cachedcontentnode.insert(dockitem.contents); } - placeholder.replace(Y.Node.getDOMNode(this.cachedcontentnode)); - this.cachedcontentnode = Y.one('#'+this.cachedcontentnode.get('id')); + placeholder.replace(this.Y.Node.getDOMNode(this.cachedcontentnode)); + this.cachedcontentnode = this.Y.one('#'+this.cachedcontentnode.get('id')); this.resize_block_space(this.cachedcontentnode); this.cachedcontentnode.all('a.moveto').each(function(moveto){ - Y.Event.purgeElement(Y.Node.getDOMNode(moveto), false, 'click'); + this.Y.Event.purgeElement(this.Y.Node.getDOMNode(moveto), false, 'click'); moveto.on('movetodock|click', this.move_to_dock, this); if (moveto.hasClass('customcommand')) { moveto.all('img').each(function(movetoimg){ @@ -486,12 +510,13 @@ M.blocks.dock = { }, /** * This namespace contains the generic properties, methods and events - * that will be bound to the M.blocks.dock.item class. + * that will be bound to the M.core_dock.item class. * These can then be overriden to customise the way dock items work/display * @namespace */ abstract_item_class : { + Y : null, // The YUI instance to use with this dock item id : null, // The unique id for the item name : null, // The name of the item title : null, // The title of the item @@ -500,7 +525,7 @@ M.blocks.dock = { active : false, // True if the item is being shown panel : null, // The YUI2 panel the item will be shown in preventhide : false, // If true the next call to hide will be ignored - cfg : null, // The config options for this item by default M.blocks.cfg + cfg : null, // The config options for this item by default M.core_dock.cfg /** * Initialises all of the items events @@ -523,17 +548,17 @@ M.blocks.dock = { */ draw : function() { this.fire('dockeditem:drawstart'); - var dockitemtitle = Y.Node.create('
'); + var dockitemtitle = this.Y.Node.create('
'); dockitemtitle.append(this.title); - var dockitem = Y.Node.create('
'); - if (M.blocks.dock.count === 1) { + var dockitem = this.Y.Node.create('
'); + if (M.core_dock.count === 1) { dockitem.addClass('firstdockitem'); } dockitem.append(dockitemtitle); if (this.commands.hasChildNodes) { this.contents.appendChild(this.commands); } - M.blocks.dock.append(dockitem); + M.core_dock.append(dockitem); var position = dockitemtitle.getXY(); position[0] += parseInt(dockitemtitle.get('offsetWidth')); @@ -557,11 +582,11 @@ M.blocks.dock = { 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') { - Y.one(this.panel.body).setStyle('minWidth', this.cfg.display.mindisplaywidth); - Y.one(this.panel.body).setStyle('minHeight', dockitemtitle.get('offsetHeight')+'px'); + this.panel.setBody(this.Y.Node.getDOMNode(this.contents)); + this.panel.render(M.core_dock.node); + if (this.cfg.display.mindisplaywidth !== null && this.Y.one(this.panel.body).getStyle('minWidth') == '0px') { + this.Y.one(this.panel.body).setStyle('minWidth', this.cfg.display.mindisplaywidth); + this.Y.one(this.panel.body).setStyle('minHeight', dockitemtitle.get('offsetHeight')+'px'); } dockitem.on('showitem|mouseover', this.show, this); this.fire('dockeditem:drawcomplete'); @@ -572,7 +597,7 @@ M.blocks.dock = { */ remove : function (e) { this.hide(e); - Y.one('#dock_item_'+this.id).remove(); + this.Y.one('#dock_item_'+this.id).remove(); this.panel.destroy(); this.fire('dockitem:itemremoved'); }, @@ -581,16 +606,16 @@ M.blocks.dock = { * @param {event} */ show : function(e) { - M.blocks.dock.hide_all(); + M.core_dock.hide_all(); this.fire('dockeditem:showstart'); this.panel.show(e, this); this.active = true; - Y.one('#dock_item_'+this.id+'_title').addClass(this.cfg.css.activeitem); - Y.detach('mouseover', this.show, Y.one('#dock_item_'+this.id)); - Y.one('#dock_item_panel_'+this.id).on('dockpreventhide|click', function(){this.preventhide=true;}, this); - Y.one('#dock_item_'+this.id).on('dockhide|click', this.hide, this); - Y.get(window).on('dockresize|resize', this.resize_panel, this); - Y.get(document.body).on('dockhide|click', this.hide, this); + this.Y.one('#dock_item_'+this.id+'_title').addClass(this.cfg.css.activeitem); + this.Y.detach('mouseover', this.show, this.Y.one('#dock_item_'+this.id)); + this.Y.one('#dock_item_panel_'+this.id).on('dockpreventhide|click', function(){this.preventhide=true;}, this); + this.Y.one('#dock_item_'+this.id).on('dockhide|click', this.hide, this); + this.Y.get(window).on('dockresize|resize', this.resize_panel, this); + this.Y.get(document.body).on('dockhide|click', this.hide, this); this.fire('dockeditem:showcomplete'); return true; }, @@ -605,10 +630,10 @@ M.blocks.dock = { } else if (this.active) { this.fire('dockeditem:hidestart'); this.active = false; - Y.one('#dock_item_'+this.id+'_title').removeClass(this.cfg.css.activeitem); - Y.one('#dock_item_'+this.id).on('showitem|mouseover', this.show, this); - Y.get(window).detach('dockresize|resize'); - Y.get(document.body).detach('dockhide|click'); + this.Y.one('#dock_item_'+this.id+'_title').removeClass(this.cfg.css.activeitem); + this.Y.one('#dock_item_'+this.id).on('showitem|mouseover', this.show, this); + this.Y.get(window).detach('dockresize|resize'); + this.Y.get(document.body).detach('dockhide|click'); this.panel.hide(e, this); this.fire('dockeditem:hidecomplete'); } @@ -619,12 +644,12 @@ M.blocks.dock = { */ resize_panel : function() { this.fire('dockeditem:resizestart'); - var panelbody = Y.one(this.panel.body); + var panelbody = this.Y.one(this.panel.body); var buffer = this.cfg.buffer; - var screenheight = parseInt(Y.get(document.body).get('winHeight')); + var screenheight = parseInt(this.Y.get(document.body).get('winHeight')); var panelheight = parseInt(panelbody.get('offsetHeight')); var paneltop = parseInt(this.panel.cfg.getProperty('y')); - var titletop = parseInt(Y.one('#dock_item_'+this.id+'_title').getY()); + var titletop = parseInt(this.Y.one('#dock_item_'+this.id+'_title').getY()); var scrolltop = window.pageYOffset || document.body.scrollTop || 0; // This makes sure that the panel is the same height as the dock title to @@ -658,61 +683,66 @@ M.blocks.dock = { * This class represents a generic block * @class genericblock * @constructor - * @param {int} uid */ -M.blocks.genericblock = function(uid){ - // Save the unique id as the blocks id - if (uid && this.id==null) { - this.id = uid; - } - if (this instanceof M.blocks.genericblock) { - this.init(); - } -}; +M.core_dock.genericblock = function() {}; /** Properties */ -M.blocks.genericblock.prototype.name = M.blocks.dock.abstract_block_class.name; -M.blocks.genericblock.prototype.cachedcontentnode = M.blocks.dock.abstract_block_class.cachedcontentnode; -M.blocks.genericblock.prototype.blockspacewidth = M.blocks.dock.abstract_block_class.blockspacewidth; -M.blocks.genericblock.prototype.skipsetposition = M.blocks.dock.abstract_block_class.skipsetposition; +M.core_dock.genericblock.prototype.cachedcontentnode = M.core_dock.abstract_block_class.cachedcontentnode; +M.core_dock.genericblock.prototype.blockspacewidth = M.core_dock.abstract_block_class.blockspacewidth; +M.core_dock.genericblock.prototype.skipsetposition = M.core_dock.abstract_block_class.skipsetposition; /** Methods **/ -M.blocks.genericblock.prototype.init = M.blocks.dock.abstract_block_class.init; -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; +M.core_dock.genericblock.prototype.init = M.core_dock.abstract_block_class.init; +M.core_dock.genericblock.prototype.move_to_dock = M.core_dock.abstract_block_class.move_to_dock; +M.core_dock.genericblock.prototype.resize_block_space = M.core_dock.abstract_block_class.resize_block_space; +M.core_dock.genericblock.prototype.return_to_block = M.core_dock.abstract_block_class.return_to_block; +M.core_dock.genericblock.prototype.fix_title_orientation = M.core_dock.abstract_block_class.fix_title_orientation; /** * This class represents an item in the dock * @class item * @constructor * @param {int} uid The unique ID for the item - * @param {Y.Node} title - * @param {Y.Node} contents - * @param {Y.Node} commands + * @param {this.Y.Node} title + * @param {this.Y.Node} contents + * @param {this.Y.Node} commands */ -M.blocks.dock.item = function(uid, title, contents, commands){ - if (uid && this.id==null) this.id = uid; - if (title && this.title==null) this.title = title; - if (contents && this.contents==null) this.contents = contents; - if (commands && this.commands==null) this.commands = commands; +M.core_dock.item = function(Y, uid, title, contents, commands){ + this.Y = Y; + if (uid && this.id==null) { + this.id = uid; + } + if (title && this.title==null) { + this.title = title; + } + if (contents && this.contents==null) { + this.contents = contents; + } + if (commands && this.commands==null) { + this.commands = commands; + } this.init_events(); } /** Properties */ -M.blocks.dock.item.prototype.id = M.blocks.dock.abstract_item_class.id; -M.blocks.dock.item.prototype.name = M.blocks.dock.abstract_item_class.name; -M.blocks.dock.item.prototype.title = M.blocks.dock.abstract_item_class.title; -M.blocks.dock.item.prototype.contents = M.blocks.dock.abstract_item_class.contents; -M.blocks.dock.item.prototype.commands = M.blocks.dock.abstract_item_class.commands; -M.blocks.dock.item.prototype.active = M.blocks.dock.abstract_item_class.active; -M.blocks.dock.item.prototype.panel = M.blocks.dock.abstract_item_class.panel; -M.blocks.dock.item.prototype.preventhide = M.blocks.dock.abstract_item_class.preventhide; -M.blocks.dock.item.prototype.cfg = M.blocks.dock.cfg; +M.core_dock.item.prototype.id = M.core_dock.abstract_item_class.id; +M.core_dock.item.prototype.name = M.core_dock.abstract_item_class.name; +M.core_dock.item.prototype.title = M.core_dock.abstract_item_class.title; +M.core_dock.item.prototype.contents = M.core_dock.abstract_item_class.contents; +M.core_dock.item.prototype.commands = M.core_dock.abstract_item_class.commands; +M.core_dock.item.prototype.active = M.core_dock.abstract_item_class.active; +M.core_dock.item.prototype.panel = M.core_dock.abstract_item_class.panel; +M.core_dock.item.prototype.preventhide = M.core_dock.abstract_item_class.preventhide; +M.core_dock.item.prototype.cfg = M.core_dock.cfg; /** Methods **/ -M.blocks.dock.item.prototype.init_events = M.blocks.dock.abstract_item_class.init_events; -M.blocks.dock.item.prototype.draw = M.blocks.dock.abstract_item_class.draw; -M.blocks.dock.item.prototype.remove = M.blocks.dock.abstract_item_class.remove; -M.blocks.dock.item.prototype.show = M.blocks.dock.abstract_item_class.show; -M.blocks.dock.item.prototype.hide = M.blocks.dock.abstract_item_class.hide; -M.blocks.dock.item.prototype.resize_panel = M.blocks.dock.abstract_item_class.resize_panel; +M.core_dock.item.prototype.init_events = M.core_dock.abstract_item_class.init_events; +M.core_dock.item.prototype.draw = M.core_dock.abstract_item_class.draw; +M.core_dock.item.prototype.remove = M.core_dock.abstract_item_class.remove; +M.core_dock.item.prototype.show = M.core_dock.abstract_item_class.show; +M.core_dock.item.prototype.hide = M.core_dock.abstract_item_class.hide; +M.core_dock.item.prototype.resize_panel = M.core_dock.abstract_item_class.resize_panel; -YUI.add('blocks_dock', M.blocks.dock.init, '0.0.0.1', 'requires', M.yui.loader.modules['blocks_dock'].requires); \ No newline at end of file +/** + * This ensures that the first time the dock module is used it is initiatlised. + * + * NOTE: Never convert the second argument to a function reference... + * doing so causes scoping issues + */ +YUI.add('core_dock', function(Y) {M.core_dock.init(Y);}, '0.0.0.1', 'requires', M.yui.loader.modules['core_dock'].requires); \ No newline at end of file diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php index b6b8abe9b98..d13845c534e 100644 --- a/blocks/global_navigation_tree/block_global_navigation_tree.php +++ b/blocks/global_navigation_tree/block_global_navigation_tree.php @@ -82,7 +82,8 @@ class block_global_navigation_tree extends block_tree { function get_required_javascript() { global $CFG; $this->_initialise_dock(); - $this->page->requires->js_module(array('name'=>'blocks_navigation', 'fullpath'=>'/blocks/global_navigation_tree/navigation.js', 'requires'=>array('blocks_dock', 'io', 'node', 'dom', 'event-custom'))); + $this->page->requires->js_module(array('name'=>'core_dock', 'fullpath'=>'/blocks/dock.js', 'requires'=>array('base', 'cookie', 'dom', 'io', 'node', 'event-custom'))); + $this->page->requires->js_module(array('name'=>'blocks_navigation', 'fullpath'=>'/blocks/global_navigation_tree/navigation.js', 'requires'=>array('core_dock', 'io', 'node', 'dom', 'event-custom'))); user_preference_allow_ajax_update('docked_block_instance_'.$this->instance->id, PARAM_INT); } @@ -155,7 +156,7 @@ class block_global_navigation_tree extends block_tree { // Initialise the JS tree object $args = array($this->instance->id, array('expansions'=>$expandable,'instance'=>$this->instance->id, 'candock'=>$this->instance_can_be_docked())); - $this->page->requires->js_object_init("M.blocks.navigation.treecollection[".$this->instance->id."]", 'M.blocks.navigation.classes.tree', $args, array('blocks_navigation')); + $this->page->requires->js_object_init("M.blocks_navigation.treecollection[".$this->instance->id."]", 'M.blocks_navigation.classes.tree', $args, array('blocks_navigation')); // Grab the items to display $this->content->items = array($this->page->navigation); diff --git a/blocks/global_navigation_tree/navigation.js b/blocks/global_navigation_tree/navigation.js index 67e0dc7834a..337ff2ae378 100644 --- a/blocks/global_navigation_tree/navigation.js +++ b/blocks/global_navigation_tree/navigation.js @@ -23,18 +23,12 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -/** - * This namespace will contain all of the information fo the blocks - * @namespace - */ -var blocks = blocks || {}; - /** * This namespace will contain all of the contents of the navigation blocks * global navigation and settings. * @namespace */ -M.blocks.navigation = { +M.blocks_navigation = { /** The number of expandable branches in existence */ expandablebranchcount:0, /** An array of initialised trees */ @@ -51,10 +45,10 @@ M.blocks.navigation = { * NOTE: This will only be executed ONCE * @function */ - init:function() { - if (M.blocks.genericblock) { + init:function(Y) { + if (M.core_dock.genericblock) { // Give the tree class the dock block properties - Y.augment(M.blocks.navigation.classes.tree, M.blocks.genericblock); + Y.augment(M.blocks_navigation.classes.tree, M.core_dock.genericblock); } } }; @@ -62,15 +56,16 @@ M.blocks.navigation = { /** * @class tree * @constructor - * @base M.blocks.dock.abstractblock + * @base M.core_dock.abstractblock + * @param {YUI} Y A yui instance to use with the navigation * @param {string} id The name of the tree * @param {int} key The internal id within the tree store * @param {object} properties Object containing tree properties */ -M.blocks.navigation.classes.tree = function(id, properties) { +M.blocks_navigation.classes.tree = function(Y, id, properties) { + this.Y = Y; this.id = id; this.key = id; - this.type = 'M.blocks.navigation.classes.tree'; this.errorlog = []; this.ajaxbranches = 0; this.expansions = []; @@ -91,7 +86,7 @@ M.blocks.navigation.classes.tree = function(id, properties) { this.candock = true; } - var node = Y.one('#inst'+this.id); + var node = this.Y.one('#inst'+this.id); // Can't find the block instance within the page if (node === null) { @@ -102,8 +97,8 @@ M.blocks.navigation.classes.tree = function(id, properties) { // Attache events to expand by AJAX for (var i in this.expansions) { - Y.one('#'+this.expansions[i].id).on('ajaxload|click', this.init_load_ajax, this, this.expansions[i]); - M.blocks.navigation.expandablebranchcount++; + this.Y.one('#'+this.expansions[i].id).on('ajaxload|click', this.init_load_ajax, this, this.expansions[i]); + M.blocks_navigation.expandablebranchcount++; } if (node.hasClass('block_js_expansion')) { @@ -113,7 +108,7 @@ M.blocks.navigation.classes.tree = function(id, properties) { // Call the generic blocks init method to add all the generic stuff if (this.candock) { - this.init(node); + this.init(Y, node); } } @@ -122,7 +117,7 @@ M.blocks.navigation.classes.tree = function(id, properties) { * @param {event} e The event object * @param {object} branch A branch to load via ajax */ -M.blocks.navigation.classes.tree.prototype.init_load_ajax = function(e, branch) { +M.blocks_navigation.classes.tree.prototype.init_load_ajax = function(e, branch) { e.stopPropagation(); if (e.target.get('nodeName').toUpperCase() != 'P') { return true; @@ -131,12 +126,12 @@ M.blocks.navigation.classes.tree.prototype.init_load_ajax = function(e, branch) if (this.instance != null) { cfginstance = '&instance='+this.instance } - Y.io(M.cfg.wwwroot+'/lib/ajax/getnavbranch.php', { + this.Y.io(M.cfg.wwwroot+'/lib/ajax/getnavbranch.php', { method:'POST', data:'elementid='+branch.id+'&id='+branch.branchid+'&type='+branch.type+'&sesskey='+M.cfg.sesskey+cfginstance, on: { complete:this.load_ajax, - success:function() {Y.detach('click', this.init_load_ajax, e.target);} + success:function() {this.Y.detach('click', this.init_load_ajax, e.target);} }, context:this, arguments:{ @@ -153,14 +148,14 @@ M.blocks.navigation.classes.tree.prototype.init_load_ajax = function(e, branch) * @param {mixed} args * @return bool */ -M.blocks.navigation.classes.tree.prototype.load_ajax = function(tid, outcome, args) { +M.blocks_navigation.classes.tree.prototype.load_ajax = function(tid, outcome, args) { // Check the status if (outcome.status!=0 && outcome.responseXML!=null) { var branch = outcome.responseXML.documentElement; if (branch!=null && this.add_branch(branch, args.target.ancestor('LI') ,1)) { // If we get here everything worked perfectly if (this.candock) { - M.blocks.dock.resize(); + M.core_dock.resize(); } return true; } @@ -177,17 +172,17 @@ M.blocks.navigation.classes.tree.prototype.load_ajax = function(tid, outcome, ar * @param {int} depth * @return bool */ -M.blocks.navigation.classes.tree.prototype.add_branch = function(branchxml, target, depth) { +M.blocks_navigation.classes.tree.prototype.add_branch = function(branchxml, target, depth) { // Make the new branch into an object - var branch = new M.blocks.navigation.classes.branch(this, branchxml); + var branch = new M.blocks_navigation.classes.branch(this, branchxml); var childrenul = false; if (depth === 1) { if (!branch.haschildren) { return false; } - childrenul = Y.Node.create(''); + childrenul = this.Y.Node.create(''); target.appendChild(childrenul); } else { childrenul = branch.inject_into_dom(target); @@ -204,7 +199,7 @@ M.blocks.navigation.classes.tree.prototype.add_branch = function(branchxml, targ * Toggle a branch as expanded or collapsed * @param {Event} e */ -M.blocks.navigation.classes.tree.prototype.toggleexpansion = function(e) { +M.blocks_navigation.classes.tree.prototype.toggleexpansion = function(e) { // First check if they managed to click on the li iteslf, then find the closest // LI ancestor and use that if (e.target.get('nodeName').toUpperCase() == 'LI') { @@ -213,7 +208,7 @@ M.blocks.navigation.classes.tree.prototype.toggleexpansion = function(e) { e.target.ancestor('LI').toggleClass('collapsed'); } if (this.candock) { - M.blocks.dock.resize(); + M.core_dock.resize(); } } @@ -221,10 +216,10 @@ M.blocks.navigation.classes.tree.prototype.toggleexpansion = function(e) { * This class represents a branch for a tree * @class branch * @constructor - * @param {M.blocks.navigation.classes.tree} tree + * @param {M.blocks_navigation.classes.tree} tree * @param {xmldoc|null} xml */ -M.blocks.navigation.classes.branch = function(tree, xml) { +M.blocks_navigation.classes.branch = function(tree, xml) { this.tree = tree; this.name = null; this.title = null; @@ -248,7 +243,7 @@ M.blocks.navigation.classes.branch = function(tree, xml) { * Constructs a branch from XML * @param {xmldoc} xml */ -M.blocks.navigation.classes.branch.prototype.construct_from_xml = function(xml) { +M.blocks_navigation.classes.branch.prototype.construct_from_xml = function(xml) { // Get required attributes this.title = xml.getAttribute('title'); this.classname = xml.getAttribute('class'); @@ -265,8 +260,8 @@ M.blocks.navigation.classes.branch.prototype.construct_from_xml = function(xml) if (this.id && this.id.match(/^expandable_branch_\d+$/)) { // Assign a new unique id for this new expandable branch - M.blocks.navigation.expandablebranchcount++; - this.id = 'expandable_branch_'+M.blocks.navigation.expandablebranchcount; + M.blocks_navigation.expandablebranchcount++; + this.id = 'expandable_branch_'+M.blocks_navigation.expandablebranchcount; } // Retrieve any additional information @@ -285,10 +280,10 @@ M.blocks.navigation.classes.branch.prototype.construct_from_xml = function(xml) * Injects a branch into the tree at the given location * @param {element} element */ -M.blocks.navigation.classes.branch.prototype.inject_into_dom = function(element) { +M.blocks_navigation.classes.branch.prototype.inject_into_dom = function(element) { - var branchli = Y.Node.create('
  • '); - var branchp = Y.Node.create('

    '); + var branchli = this.tree.Y.Node.create('
  • '); + var branchp = this.tree.Y.Node.create('

    '); if ((this.expandable !== null || this.haschildren) && this.expansionceiling===null) { branchli.addClass('collapsed'); @@ -308,7 +303,7 @@ M.blocks.navigation.classes.branch.prototype.inject_into_dom = function(element) var branchicon = false; if (this.icon != null) { - branchicon = Y.Node.create(''); + branchicon = this.tree.Y.Node.create(''); this.name = ' '+this.name; } if (this.link === null) { @@ -317,7 +312,7 @@ M.blocks.navigation.classes.branch.prototype.inject_into_dom = function(element) } branchp.append(this.name.replace(/\n/g, '
    ')); } else { - var branchlink = Y.Node.create(''+this.name.replace(/\n/g, '
    ')+'    '); + var branchlink = this.tree.Y.Node.create(''+this.name.replace(/\n/g, '
    ')+'    '); if (branchicon) { branchlink.appendChild(branchicon); } @@ -329,7 +324,7 @@ M.blocks.navigation.classes.branch.prototype.inject_into_dom = function(element) branchli.appendChild(branchp); if (this.haschildren) { - var childrenul = Y.Node.create(''); + var childrenul = this.tree.Y.Node.create(''); branchli.appendChild(childrenul); element.appendChild(branchli); return childrenul @@ -339,4 +334,11 @@ M.blocks.navigation.classes.branch.prototype.inject_into_dom = function(element) } } -YUI.add('blocks_navigation', M.blocks.navigation.init, '0.0.0.1', M.yui.loader.modules.blocks_navigation.requires); \ No newline at end of file +/** + * Causes the navigation block module to initalise the first time the module + * is used! + * + * NOTE: Never convert the second argument to a function reference... + * doing so causes scoping issues + */ +YUI.add('blocks_navigation', function(Y){M.blocks_navigation.init(Y);}, '0.0.0.1', M.yui.loader.modules.blocks_navigation.requires); \ No newline at end of file diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php index 97415c93b75..60e6e0dc3ac 100644 --- a/blocks/moodleblock.class.php +++ b/blocks/moodleblock.class.php @@ -578,7 +578,7 @@ class block_base { function get_required_javascript() { $this->_initialise_dock(); if ($this->instance_can_be_docked()) { - $this->page->requires->js_object_init(null, 'M.blocks.genericblock', array($this->instance->id), array('blocks_dock')); + $this->page->requires->js_init_call('M.core_dock.init_genericblock', array($this->instance->id)); user_preference_allow_ajax_update('docked_block_instance_'.$this->instance->id, PARAM_INT); } } @@ -752,7 +752,6 @@ 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('dom','io','node', 'event-custom', 'cookie'))); $this->page->requires->strings_for_js(array('addtodock','undockitem','undockall'), 'block'); self::$dockinitialised = true; } diff --git a/blocks/settings_navigation_tree/block_settings_navigation_tree.php b/blocks/settings_navigation_tree/block_settings_navigation_tree.php index f07084aba7b..f5924abed7b 100644 --- a/blocks/settings_navigation_tree/block_settings_navigation_tree.php +++ b/blocks/settings_navigation_tree/block_settings_navigation_tree.php @@ -80,9 +80,10 @@ class block_settings_navigation_tree extends block_tree { function get_required_javascript() { global $CFG; $this->_initialise_dock(); - $this->page->requires->js_module(array('name'=>'blocks_navigation', 'fullpath'=>'/blocks/global_navigation_tree/navigation.js', 'requires'=>array('blocks_dock', 'io', 'node', 'dom', 'event-custom'))); + $this->page->requires->js_module(array('name'=>'core_dock', 'fullpath'=>'/blocks/dock.js', 'requires'=>array('base', 'cookie', 'dom', 'io', 'node', 'event-custom'))); + $this->page->requires->js_module(array('name'=>'blocks_navigation', 'fullpath'=>'/blocks/global_navigation_tree/navigation.js', 'requires'=>array('core_dock', 'io', 'node', 'dom', 'event-custom'))); $arguments = array($this->instance->id, array('instance'=>$this->instance->id, 'candock'=>$this->instance_can_be_docked())); - $this->page->requires->js_object_init("M.blocks.navigation.treecollection[".$this->instance->id."]", 'M.blocks.navigation.classes.tree', $arguments, array('blocks_navigation')); + $this->page->requires->js_object_init("M.blocks_navigation.treecollection[".$this->instance->id."]", 'M.blocks_navigation.classes.tree', $arguments, array('blocks_navigation')); user_preference_allow_ajax_update('docked_block_instance_'.$this->instance->id, PARAM_INT); } diff --git a/calendar/calendar.js b/calendar/calendar.js index f7aa6df5292..f0a999967f4 100644 --- a/calendar/calendar.js +++ b/calendar/calendar.js @@ -3,88 +3,86 @@ * @namespace */ M = M || {}; -M.blocks = M.blocks || {}; /** * A calendar namespace for the calendar block * @namespace */ -M.blocks.calendar = { +M.core_calendar = { // The seconds to delay the show of a calendar event by showdelaysecs: 1, // The calendar event currently pending display showdelayevent: null, // An array containing all calendar events events : [], + init : function(Y, properties) { + var id = properties.id; + this.events[id] = (function(Y, properties){ + // Prepares an event object that this function will return + var event = { + id : properties.id, + title : properties.title, + content : properties.content, + displayed : false, + panel : null, + node : Y.one('#'+properties.id), + /** + * Initialises the calendar event to show after the given delay + * @function + * @param {Event} e + */ + show_init : function(e) { + if (M.core_calendar.showdelayevent !== this.id) { + if (M.core_calendar.showdelayevent !== null) { + M.core_calendar.events[M.blocks.calendar.showdelayevent].hide(e); + } + M.core_calendar.showdelayevent = this.id; + setTimeout(M.core_calendar.show_event_callback, M.core_calendar.showdelaysecs*1000); + } + }, + /** + * Hides the events panel if it is being displayed + * @function + * @param {Event} e + */ + hide : function(e) { + M.core_calendar.showdelayevent = null; + if (this.displayed) { + this.displayed = false; + this.panel.hide(); + } + }, + /** + * Shows the calendar event + * @function + */ + show : function() { + this.panel = new YAHOO.widget.Panel(this.id+'_panel', { + width:"240px", + visible:false, + draggable:false, + close:false, + constraintoviewport:true + }); + this.panel.setHeader(this.title); + this.panel.setBody(this.content); + this.panel.render(this.id); + this.panel.show(); + this.displayed = true; + } + } + event.node.on('mouseenter', event.show_init, event); + event.node.on('mouseleave', event.hide, event); + return event; + })(Y, properties); + }, /** * Callback function for the showback method * @function */ show_event_callback : function() { - if (M.blocks.calendar.showdelayevent !== null) { - M.blocks.calendar.events[M.blocks.calendar.showdelayevent].show(); + if (M.core_calendar.showdelayevent !== null) { + M.core_calendar.events[M.core_calendar.showdelayevent].show(); } } -} - -/** - * A calendar event class - * @class - * @constructor - */ -M.blocks.calendar.event = function(properties) { - this.id = properties.id; - this.title = properties.title; - this.content = properties.content; - this.displayed = false; - this.panel = null; - this.node = Y.one('#'+this.id); - this.node.on('mouseenter', this.show_init, this); - this.node.on('mouseleave', this.hide, this); -} - -/** - * Hides the events panel if it is being displayed - * @function - */ -M.blocks.calendar.event.prototype.hide = function(e) { - M.blocks.calendar.showdelayevent = null; - if (this.displayed) { - this.displayed = false; - this.panel.hide(); - } -} - -/** - * Initialises the calendar event to show after the given delay - * @function - * @param {event} e - */ -M.blocks.calendar.event.prototype.show_init = function(e) { - if (M.blocks.calendar.showdelayevent !== this.id) { - if (M.blocks.calendar.showdelayevent !== null) { - M.blocks.calendar.events[M.blocks.calendar.showdelayevent].hide(e); - } - M.blocks.calendar.showdelayevent = this.id; - setTimeout(M.blocks.calendar.show_event_callback, M.blocks.calendar.showdelaysecs*1000); - } -} - -/** - * Shows the calendar event - * @function - */ -M.blocks.calendar.event.prototype.show = function() { - this.panel = new YAHOO.widget.Panel(this.id+'_panel', { - width:"240px", - visible:false, - draggable:false, - close:false, - constraintoviewport:true - }); - this.panel.setHeader(this.title); - this.panel.setBody(this.content); - this.panel.render(this.id); - this.panel.show(); - this.displayed = true; -}; \ No newline at end of file +} \ No newline at end of file diff --git a/calendar/event.php b/calendar/event.php index e9d3ef46aba..f484c223bd0 100644 --- a/calendar/event.php +++ b/calendar/event.php @@ -200,8 +200,6 @@ if ($data) { redirect($eventurl); } -$PAGE->requires->js_module(array('name'=>'blocks_calendar', 'fullpath'=>'/calendar/calendar.js', 'requires'=>array('dom', 'event', 'node', 'yui2-animation','event-mouseenter'))); - $PAGE->navbar->add($strcalendar, $link); $PAGE->navbar->add($title); $PAGE->set_title($site->shortname.': '.$strcalendar.': '.$title); diff --git a/calendar/lib.php b/calendar/lib.php index 7b03b5194f5..8a46ae4f7f9 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -379,9 +379,7 @@ function calendar_get_popup($is_today, $event_timestart, $popupcontent='') { $popupcaption .= get_string('eventsfor', 'calendar', userdate($event_timestart, get_string('strftimedayshort'))); } $id = 'calendar_tooltip_'.$popupcount; - $PAGE->requires->yui2_lib('container'); - - $PAGE->requires->js_object_init("M.blocks.calendar.events['$id']", 'M.blocks.calendar.event', array(array('id'=>$id,'title'=>$popupcaption, 'content'=>$popupcontent)), array('blocks_calendar')); + $PAGE->requires->js_init_call("M.core_calendar.init", array(array('id'=>$id,'title'=>$popupcaption, 'content'=>$popupcontent))); $popupcount++; return 'id="'.$id.'"'; diff --git a/calendar/view.php b/calendar/view.php index c3e94263b6f..6361a0b4613 100644 --- a/calendar/view.php +++ b/calendar/view.php @@ -154,8 +154,6 @@ $PAGE->set_title("$site->shortname: $strcalendar: $pagetitle"); $PAGE->set_heading($strcalendar); $PAGE->set_button($prefsbutton); -$PAGE->requires->js_module(array('name'=>'blocks_calendar', 'fullpath'=>'/calendar/calendar.js', 'requires'=>array('dom', 'event', 'node', 'yui2-animation','event-mouseenter'))); - echo $OUTPUT->header(); // Layout the whole page as three big columns. diff --git a/lib/ajax/ajaxlib.php b/lib/ajax/ajaxlib.php index 3941c210650..017bf5615e0 100644 --- a/lib/ajax/ajaxlib.php +++ b/lib/ajax/ajaxlib.php @@ -343,6 +343,10 @@ class page_requirements_manager { $module = array('name'=>$name, 'fullpath'=>'/admin/roles/module.js'); } else if($name === 'core_completion') { $module = array('name'=>$name, 'fullpath'=>'/course/completion.js'); + } else if ($name === 'core_dock') { + $module = array('name'=>'core_dock', 'fullpath'=>'/blocks/dock.js', 'requires'=>array('base', 'cookie', 'dom', 'io', 'node', 'event-custom')); + } else if ($name === 'core_calendar') { + $module = array('name'=>'core_calendar', 'fullpath'=>'/calendar/calendar.js', 'requires'=>array('dom', 'event', 'node', 'yui2-container','event-mouseenter')); } } else { if ($dir = get_component_directory($name, false)) { diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index a09f8889755..d1b2766971d 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -615,11 +615,11 @@ class js_writer { } if ($var === null) { - $js = "new $class($arguments);"; + $js = "new $class(Y, $arguments);"; } else if (strpos($var, '.')!==false) { - $js = "$var = new $class($arguments);"; + $js = "$var = new $class(Y, $arguments);"; } else { - $js = "var $var = new $class($arguments);"; + $js = "var $var = new $class(Y, $arguments);"; } if ($delay) { @@ -629,7 +629,7 @@ class js_writer { if (count($requirements) > 0) { $requirements = implode("', '", $requirements); - $js = "Y.use('$requirements', function(){ $js });"; + $js = "Y.use('$requirements', function(Y){ $js });"; } return $js."\n"; } diff --git a/theme/standardold/config.php b/theme/standardold/config.php index b8bdb26089d..2948a5a6970 100644 --- a/theme/standardold/config.php +++ b/theme/standardold/config.php @@ -177,7 +177,7 @@ $THEME->layouts = array( ); /** List of javascript files that need to included on each page */ -//$THEME->javascripts_footer = array('navigation'); +$THEME->javascripts_footer = array('navigation'); /** * This enables the dock on the side of the page as this theme supports it. diff --git a/theme/standardold/javascript/navigation.js b/theme/standardold/javascript/navigation.js index e9ee0e4b0ce..a92be8dbead 100644 --- a/theme/standardold/javascript/navigation.js +++ b/theme/standardold/javascript/navigation.js @@ -1,27 +1,18 @@ -// This attaches a shadow to the dock when it has been drawn (added to the page) -blocks.dock.on('dock:drawcompleted', function() { - blocks.dock.node.append(shadow.create(true, true, true, true)); -}); -blocks.dock.on('dock:itemadded', function(item) { - item.on('dockeditem:showcomplete', function() { - Y.one('#dock_item_panel_'+this.id).append(shadow.create(true, true, true, false)); - }); - item.on('dockeditem:hidestart', function() { - shadow.remove(Y.one('#dock_item_panel_'+this.id)); - }); -}); - +/** + * This attaches a shadow to the dock when it has been drawn (added to the page) + */ var shadow = { /** * This function create a series of DIV's appended to an element to give it a * shadow + * @param {YUI} Y * @param {bool} top Displays a top shadow if true * @param {bool} right Displays a right shadow if true * @param {bool} bottom Displays a bottom shadow if true * @param {bool} left Displays a left shadow if true * @return {Y.Node} */ - create : function(top, right, bottom, left) { + create : function(Y, top, right, bottom, left) { var shadow = Y.Node.create('
    '); if (Y.UA.ie > 0 && Y.UA.ie < 7) { // IE 6 doesn't like this shadow method @@ -45,4 +36,76 @@ var shadow = { remove : function(node) { node.all('.divshadow').remove(); } +} + +function customise_dock_for_theme() { + // If we don't have M.blocks or Y then bail + if (!M.core_dock) { + return false; + } + // On draw completed add the ability to move the dock to from the left to the right + M.core_dock.on('dock:drawcompleted', function() { + M.core_dock.node.append(shadow.create(M.core_dock.Y, true, true, true, true)); + var movedock = M.core_dock.Y.Node.create(''); + var c = M.core_dock.node.one('.controls'); + c.insertBefore(M.core_dock.Y.Node.create('
    '), c.one('img')); + c.insertBefore(movedock, c.one('br')); + movedock.on('click', M.core_dock.move_dock, M.core_dock); + }); + // When an item is added append a shadow + M.core_dock.on('dock:itemadded', function(item) { + item.on('dockeditem:showcomplete', function() { + switch (M.core_dock.cfg.position) { + case 'left': + M.core_dock.Y.one(this.panel.body).append(shadow.create(M.core_dock.Y, true, true, true, false)); + break; + case 'right': + M.core_dock.Y.one(this.panel.body).append(shadow.create(M.core_dock.Y, true, false, true, true)); + break; + } + }); + item.on('dockeditem:hidestart', function() { + shadow.remove(M.core_dock.Y.one('#dock_item_panel_'+this.id)); + }); + item.on('dockeditem:showstart', item.correct_panel_x_pos, item); + item.on('dockeditem:resizecomplete', item.correct_panel_x_pos, item); + }); + // Corrects the panel x position for the theme + M.core_dock.item.prototype.correct_panel_x_pos = function() { + var dockoffset = M.core_dock.Y.one('#dock_item_'+this.id+'_title').get('offsetWidth'); + var panelwidth = M.core_dock.Y.one(this.panel.body).get('offsetWidth'); + var screenwidth = parseInt(M.core_dock.Y.get(document.body).get('winWidth')); + switch (M.core_dock.cfg.position) { + case 'left': + this.panel.cfg.setProperty('x', dockoffset); + break; + case 'right': + this.panel.cfg.setProperty('x', (screenwidth-panelwidth-dockoffset-1)); + break; + } + } + // Moves the dock from the left to right or vise versa + M.core_dock.move_dock = function(e) { + var oldclass = this.cfg.css.dock+'_'+this.cfg.position+'_'+this.cfg.orientation; + switch (this.cfg.position) { + case 'right':this.cfg.position = 'left';break; + case 'left':this.cfg.position = 'right';break; + } + var newclass = this.cfg.css.dock+'_'+this.cfg.position+'_'+this.cfg.orientation; + this.node.replaceClass(oldclass, newclass); + this.Y.Cookie.set('dock_position', M.core_dock.cfg.position); + }; + // When the dock is first drawn check to see if it should be moved + M.core_dock.on('dock:drawstarted', function() { + var positioncookie = M.core_dock.Y.Cookie.get('dock_position'); + if (positioncookie && positioncookie != 'null' && positioncookie !== M.core_dock.cfg.position) { + var oldposition = M.core_dock.cfg.position; + M.core_dock.cfg.position = positioncookie; + if (M.core_dock.node) { + M.core_dock.node.replaceClass(M.core_dock.cfg.css.dock+'_'+oldposition+'_'+M.core_dock.cfg.orientation, M.core_dock.cfg.css.dock+'_'+M.core_dock.cfg.position+'_'+M.core_dock.cfg.orientation); + } + } + }); + + return true; } \ No newline at end of file diff --git a/theme/standardold/pix/movedock.png b/theme/standardold/pix/movedock.png new file mode 100644 index 0000000000000000000000000000000000000000..e9c2b62b29cc10229b09a33c398ec5e99702d474 GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}Y)RhkE)4%c zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPiBOix4-^2y18-PNRC9V-A&iT2y zsd*&~&PAz-C8;S2<(VZJ3hti10pX2&;y|mSJY5_^G|sn9I_Sj|DAKmSI(^qUuYiJ! zXATt^2CR$P!mad5u&F>$Xyf;uqtb3_38x*-t!4E-z$mj_Oo#W0n{jR~>$MH9uYa|e z%FNuy`23H@gX>>!H04hE_u8NNUdFQA%men> zuN+@j^*eXr35=VnzU9N511x9j((ZiN#BSpthzPYp7YNn`1sZl>P5 zV0ZAp_@avEBCFp{=+|%NYpjswaFVEzUiEgu_1htVTrbMKwBj>c_xL7%(Mn(_;dy^~ zhL`q|;Gjyz+KCpc%VVxL8?@EArZWCfx817x<&>6w!i#00DvWowbg}SMr*5^MFTtY2 yqVr7HdHtGi<{$3=EQ>qLbZBcTbKob_Iz|V*30K^%cjo}3g2B_(&t;ucLK6VyEynBs literal 0 HcmV?d00001 diff --git a/theme/standardold/style/styles_layout.css b/theme/standardold/style/styles_layout.css index 90ed0969307..451ef021797 100644 --- a/theme/standardold/style/styles_layout.css +++ b/theme/standardold/style/styles_layout.css @@ -1877,6 +1877,7 @@ a.skip:focus, a.skip:active { /* This CSS is for the side panel */ body.has_dock { margin-left:3em; + margin-right:3em; } .dock { width:30px; @@ -1890,6 +1891,10 @@ body.has_dock { background-position:100% 0%; background-repeat:repeat-y; } +.dock.dock_right_vertical { + left:auto; + right:0px; +} .ie6 .dock { position:absolute; } @@ -4476,4 +4481,4 @@ table.mod_index { { text-align: left; border: 0px solid black; -} \ No newline at end of file +}