mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-07 09:23:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-37566-m-integration' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-02-07 01:07:04 +01:00
commit d220e90fbf
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/yui/chooserdialogue/chooserdialogue.js vendored
View File

@ -241,8 +241,21 @@ YUI.add('moodle-core-chooserdialogue', function(Y) {
newheight = newheight - (15 + 15 + 40 + 40);
dialogue.setStyle('maxHeight', newheight + 'px');
dialogueheight = bb.getStyle('height');
if (dialogueheight.match(/.*px$/)) {
dialogueheight = dialogueheight.replace(/px$/, '');
} else {
dialogueheight = totalheight;
}
if (dialogueheight < this.get('baseheight')) {
dialogueheight = this.get('baseheight');
dialogue.setStyle('height', dialogueheight + 'px');
}
// Re-calculate the location now that we've changed the size
dialoguetop = Math.max(12, ((winheight - totalheight) / 2)) + offsettop;
dialoguetop = Math.max(12, ((winheight - dialogueheight) / 2)) + offsettop;
// We need to set the height for the yui3-widget - can't work
// out what we're setting at present -- shoud be the boudingBox
@ -314,6 +327,9 @@ YUI.add('moodle-core-chooserdialogue', function(Y) {
minheight : {
value : 300
},
baseheight: {
value : 400
},
maxheight : {
value : 660
},