Merge branch '41959-26' of git://github.com/samhemelryk/moodle

This commit is contained in:
Marina Glancy 2013-10-15 13:19:30 +11:00
commit 41a403cd14
4 changed files with 1 additions and 4 deletions

View File

@ -1814,7 +1814,6 @@ BLOCK.prototype = {
commands.all('.moveto').remove();
commands.remove();
}
this.cachedcontentnode.one('.title').append(commands);
this.cachedcontentnode = null;
M.util.set_user_preference('docked_block_instance_'+id, 0);
this.set('isDocked', false);

File diff suppressed because one or more lines are too long

View File

@ -1799,7 +1799,6 @@ BLOCK.prototype = {
commands.all('.moveto').remove();
commands.remove();
}
this.cachedcontentnode.one('.title').append(commands);
this.cachedcontentnode = null;
M.util.set_user_preference('docked_block_instance_'+id, 0);
this.set('isDocked', false);

View File

@ -222,7 +222,6 @@ BLOCK.prototype = {
commands.all('.moveto').remove();
commands.remove();
}
this.cachedcontentnode.one('.title').append(commands);
this.cachedcontentnode = null;
M.util.set_user_preference('docked_block_instance_'+id, 0);
this.set('isDocked', false);