mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-40540-m26' of git://github.com/samhemelryk/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-07-23 22:56:34 +02:00
commit ae2605ec8d
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pagelib.php
View File

@ -1471,7 +1471,7 @@ class moodle_page {
if ($this->_theme->enable_dock && !empty($CFG->allowblockstodock)) {
$this->requires->strings_for_js(array('addtodock', 'undockitem', 'dockblock', 'undockblock', 'undockall', 'hidedockpanel', 'hidepanel'), 'block');
$this->requires->string_for_js('thisdirectionvertical', 'langconfig');
$this->requires->yui_module('moodle-core-dockloader', 'M.core.dock.loader.initLoader');
$this->requires->yui_module('moodle-core-dock-loader', 'M.core.dock.loader.initLoader');
}
if ($this === $PAGE) {

6
lib/yui/build/moodle-core-dockloader/moodle-core-dockloader-debug.js → lib/yui/build/moodle-core-dock-loader/moodle-core-dock-loader-debug.js vendored
View File

@ -1,4 +1,4 @@
YUI.add('moodle-core-dockloader', function (Y, NAME) {
YUI.add('moodle-core-dock-loader', function (Y, NAME) {
var LOADERNAME = 'moodle-core-dock-loader';
@ -37,8 +37,8 @@ M.core.dock.ensureMoveToIconExists = function(blocknode) {
blockaction = blocknode.one('.block_action'),
icon = 't/block_to_dock';
// Must set the image src seperatly of we get an error with XML strict headers
if (right_to_left()) {
// Must set the image src separately of we get an error with XML strict headers
if (Y.one(document.body).hasClass('dir-rtl')) {
icon = icon + '_rtl';
}
moveto.setAttribute('alt', M.util.get_string('addtodock', 'block'));

1
lib/yui/build/moodle-core-dock-loader/moodle-core-dock-loader-min.js vendored Normal file
View File

@ -0,0 +1 @@
YUI.add("moodle-core-dock-loader",function(e,t){var n="moodle-core-dock-loader";M.core=M.core||{},M.core.dock=M.core.dock||{},M.core.dock.ensureMoveToIconExists=function(t){if(t.one(".moveto"))return!0;var n,r=e.Node.create('<input type="image" class="moveto customcommand requiresjs" />'),i=t.one(".block_action"),s="t/block_to_dock";return e.one(document.body).hasClass("dir-rtl")&&(s+="_rtl"),r.setAttribute("alt",M.util.get_string("addtodock","block")),r.setAttribute("title",e.Escape.html(M.util.get_string("dockblock","block",t.one(".header .title h2").getHTML()))),r.setAttribute("src",M.util.image_url(s,"moodle")),i?i.prepend(r):(n=t.one(".header .title .commands"),!n&&t.one(".header .title")&&(n=e.Node.create('<div class="commands"></div>'),t.one(".header .title").append(n)),n.append(r)),!0},M.core.dock.loader=M.core.dock.loader||{},M.core.dock.loader.delegationEvents=[],M.core.dock.loader.initLoader=function(){var t=e.all(".block[data-instanceid][data-dockable]"),n=e.one(document.body),r;t.each(function(){var e=parseInt(this.getData("instanceid"),10);M.core.dock.ensureMoveToIconExists(this)}),t.some(function(e){return e.hasClass("dock_on_load")})?e.use("moodle-core-dock",function(){M.core.dock.init()}):(r=function(t){var n,r=this.ancestor(".block[data-instanceid]"),i=r.getData("instanceid");t.halt();for(n in M.core.dock.loader.delegationEvents)(e.Lang.isNumber(n)||e.Lang.isString(n))&&M.core.dock.loader.delegationEvents[n].detach();r.addClass("dock_on_load"),e.use("moodle-core-dock",function(){M.util.set_user_preference("docked_block_instance_"+i,1),M.core.dock.init()})},M.core.dock.loader.delegationEvents.push(n.delegate("click",r,".moveto")),M.core.dock.loader.delegationEvents.push(n.delegate("key",r,".moveto","enter")))}},"@VERSION@",{requires:["escape"]});

6
lib/yui/build/moodle-core-dockloader/moodle-core-dockloader.js → lib/yui/build/moodle-core-dock-loader/moodle-core-dock-loader.js vendored
View File

@ -1,4 +1,4 @@
YUI.add('moodle-core-dockloader', function (Y, NAME) {
YUI.add('moodle-core-dock-loader', function (Y, NAME) {
var LOADERNAME = 'moodle-core-dock-loader';
@ -37,8 +37,8 @@ M.core.dock.ensureMoveToIconExists = function(blocknode) {
blockaction = blocknode.one('.block_action'),
icon = 't/block_to_dock';
// Must set the image src seperatly of we get an error with XML strict headers
if (right_to_left()) {
// Must set the image src separately of we get an error with XML strict headers
if (Y.one(document.body).hasClass('dir-rtl')) {
icon = icon + '_rtl';
}
moveto.setAttribute('alt', M.util.get_string('addtodock', 'block'));

2
lib/yui/build/moodle-core-dock/moodle-core-dock-debug.js vendored
View File

@ -2172,6 +2172,6 @@ Y.augment(DOCKEDITEM, Y.EventTarget);
"event-mouseenter",
"event-resize",
"escape",
"moodle-core-dockloader"
"moodle-core-dock-loader"
]
});

2
lib/yui/build/moodle-core-dock/moodle-core-dock-min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/yui/build/moodle-core-dock/moodle-core-dock.js vendored
View File

@ -2154,6 +2154,6 @@ Y.augment(DOCKEDITEM, Y.EventTarget);
"event-mouseenter",
"event-resize",
"escape",
"moodle-core-dockloader"
"moodle-core-dock-loader"
]
});

1
lib/yui/build/moodle-core-dockloader/moodle-core-dockloader-min.js vendored
View File

@ -1 +0,0 @@
YUI.add("moodle-core-dockloader",function(e,t){var n="moodle-core-dock-loader";M.core=M.core||{},M.core.dock=M.core.dock||{},M.core.dock.ensureMoveToIconExists=function(t){if(t.one(".moveto"))return!0;var n,r=e.Node.create('<input type="image" class="moveto customcommand requiresjs" />'),i=t.one(".block_action"),s="t/block_to_dock";return right_to_left()&&(s+="_rtl"),r.setAttribute("alt",M.util.get_string("addtodock","block")),r.setAttribute("title",e.Escape.html(M.util.get_string("dockblock","block",t.one(".header .title h2").getHTML()))),r.setAttribute("src",M.util.image_url(s,"moodle")),i?i.prepend(r):(n=t.one(".header .title .commands"),!n&&t.one(".header .title")&&(n=e.Node.create('<div class="commands"></div>'),t.one(".header .title").append(n)),n.append(r)),!0},M.core.dock.loader=M.core.dock.loader||{},M.core.dock.loader.delegationEvents=[],M.core.dock.loader.initLoader=function(){var t=e.all(".block[data-instanceid][data-dockable]"),n=e.one(document.body),r;t.each(function(){var e=parseInt(this.getData("instanceid"),10);M.core.dock.ensureMoveToIconExists(this)}),t.some(function(e){return e.hasClass("dock_on_load")})?e.use("moodle-core-dock",function(){M.core.dock.init()}):(r=function(t){var n,r=this.ancestor(".block[data-instanceid]"),i=r.getData("instanceid");t.halt();for(n in M.core.dock.loader.delegationEvents)(e.Lang.isNumber(n)||e.Lang.isString(n))&&M.core.dock.loader.delegationEvents[n].detach();r.addClass("dock_on_load"),e.use("moodle-core-dock",function(){M.util.set_user_preference("docked_block_instance_"+i,1),M.core.dock.init()})},M.core.dock.loader.delegationEvents.push(n.delegate("click",r,".moveto")),M.core.dock.loader.delegationEvents.push(n.delegate("key",r,".moveto","enter")))}},"@VERSION@",{requires:["escape"]});

4
lib/yui/src/dock/build.json
View File

@ -11,9 +11,9 @@
"dockeditem.js"
]
},
"moodle-core-dockloader": {
"moodle-core-dock-loader": {
"jsfiles": [
"dockloader.js"
"loader.js"
]
}
}

4
lib/yui/src/dock/js/dockloader.js → lib/yui/src/dock/js/loader.js vendored
View File

@ -35,8 +35,8 @@ M.core.dock.ensureMoveToIconExists = function(blocknode) {
blockaction = blocknode.one('.block_action'),
icon = 't/block_to_dock';
// Must set the image src seperatly of we get an error with XML strict headers
if (right_to_left()) {
// Must set the image src separately of we get an error with XML strict headers
if (Y.one(document.body).hasClass('dir-rtl')) {
icon = icon + '_rtl';
}
moveto.setAttribute('alt', M.util.get_string('addtodock', 'block'));

4
lib/yui/src/dock/meta/dock.json
View File

@ -7,10 +7,10 @@
"event-mouseenter",
"event-resize",
"escape",
"moodle-core-dockloader"
"moodle-core-dock-loader"
]
},
"moodle-core-dockloader": {
"moodle-core-dock-loader": {
"requires": [
"escape"
]