Permalink
Browse files

Merge branch 'MDL-30829-22' of git://github.com/FMCorz/moodle into MO…

…ODLE_22_STABLE
  • Loading branch information...
Sam Hemelryk
Sam Hemelryk committed Sep 11, 2012
2 parents 63c4c85 + 03cc152 commit b95d2cc35e531301d3081fca3f6dd991dcb69dbd
Showing with 12 additions and 0 deletions.
  1. +12 −0 blocks/dock.js
View
@@ -863,6 +863,12 @@ M.core_dock.genericblock.prototype = {
return;
}
+ // Disable the skip anchor when docking
+ var skipanchor = node.previous();
+ if (skipanchor.hasClass('skip-block')) {
+ skipanchor.hide();
+ }
+
var blockclass = (function(classes){
var r = /(^|\s)(block_[a-zA-Z0-9_]+)(\s|$)/;
var m = r.exec(classes);
@@ -937,6 +943,12 @@ M.core_dock.genericblock.prototype = {
return_to_block : function(dockitem) {
var placeholder = this.Y.one('#content_placeholder_'+this.id);
+ // Enable the skip anchor when going back to block mode
+ var skipanchor = placeholder.previous();
+ if (skipanchor.hasClass('skip-block')) {
+ skipanchor.show();
+ }
+
if (this.cachedcontentnode.one('.header')) {
this.cachedcontentnode.one('.header').insert(dockitem.contents, 'after');
} else {

0 comments on commit b95d2cc

Please sign in to comment.