Merge branch 'MDL-42756_28' of git://github.com/aolley/moodle into MOODLE_28_STABLE

This commit is contained in:
Dan Poltawski
2014-11-17 13:52:49 +00:00
6 changed files with 14 additions and 2 deletions
@@ -1972,6 +1972,9 @@ DOCKEDITEM.prototype = {
Y.log('Showing '+this._getLogDescription(), 'debug', LOGNS);
panel.setHeader(this.get('titlestring'), this.get('commands'));
panel.setBody(Y.Node.create('<div class="block_'+this.get('blockclass')+' block_docked"></div>').append(this.get('contents')));
if (M.core.actionmenu !== undefined) {
M.core.actionmenu.newDOMNode(panel.get('node'));
}
panel.show();
panel.correctWidth();
File diff suppressed because one or more lines are too long
+3
View File
@@ -1955,6 +1955,9 @@ DOCKEDITEM.prototype = {
this.fire('dockeditem:showstart');
panel.setHeader(this.get('titlestring'), this.get('commands'));
panel.setBody(Y.Node.create('<div class="block_'+this.get('blockclass')+' block_docked"></div>').append(this.get('contents')));
if (M.core.actionmenu !== undefined) {
M.core.actionmenu.newDOMNode(panel.get('node'));
}
panel.show();
panel.correctWidth();
+3
View File
@@ -133,6 +133,9 @@ DOCKEDITEM.prototype = {
Y.log('Showing '+this._getLogDescription(), 'debug', LOGNS);
panel.setHeader(this.get('titlestring'), this.get('commands'));
panel.setBody(Y.Node.create('<div class="block_'+this.get('blockclass')+' block_docked"></div>').append(this.get('contents')));
if (M.core.actionmenu !== undefined) {
M.core.actionmenu.newDOMNode(panel.get('node'));
}
panel.show();
panel.correctWidth();
@@ -126,6 +126,9 @@ body.has_dock {
.hidepanemicon img {
cursor: pointer;
}
img.actionmenu {
width: auto;
}
}
}
}
File diff suppressed because one or more lines are too long