Merge branch 'MDL-43595-master' of git://github.com/damyon/moodle

This commit is contained in:
Dan Poltawski
2014-01-08 11:34:46 +08:00
4 changed files with 12 additions and 9 deletions
@@ -1649,7 +1649,8 @@ Y.extend(DROPDOWN, M.core.dialogue, {
body.on('clickoutside', function(e) {
if (this.get('visible')) {
if (e.target !== button && e.target.ancestor() !== button) {
// Note: we need to compare ids because for some reason - sometimes button is an Object, not a Y.Node.
if (e.target.get('id') !== button.get('id') && e.target.ancestor().get('id') !== button.get('id')) {
e.preventDefault();
this.hide();
}
File diff suppressed because one or more lines are too long
@@ -1649,7 +1649,8 @@ Y.extend(DROPDOWN, M.core.dialogue, {
body.on('clickoutside', function(e) {
if (this.get('visible')) {
if (e.target !== button && e.target.ancestor() !== button) {
// Note: we need to compare ids because for some reason - sometimes button is an Object, not a Y.Node.
if (e.target.get('id') !== button.get('id') && e.target.ancestor().get('id') !== button.get('id')) {
e.preventDefault();
this.hide();
}
+2 -1
View File
@@ -46,7 +46,8 @@ Y.extend(DROPDOWN, M.core.dialogue, {
body.on('clickoutside', function(e) {
if (this.get('visible')) {
if (e.target !== button && e.target.ancestor() !== button) {
// Note: we need to compare ids because for some reason - sometimes button is an Object, not a Y.Node.
if (e.target.get('id') !== button.get('id') && e.target.ancestor().get('id') !== button.get('id')) {
e.preventDefault();
this.hide();
}