Merge branch 'MDL-33729-master-1' of git://git.luns.net.uk/moodle

moodle · Jun 20, 2012 · eca0371 · eca0371
2 parents b1c43c3 + 605f92c
commit eca0371
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/yui/chooserdialogue/chooserdialogue.js b/lib/yui/chooserdialogue/chooserdialogue.js
@@ -95,10 +95,14 @@ YUI.add('moodle-core-chooserdialogue', function(Y) {
             }, this);
 
             // Hook onto the cancel button to hide the form
-            this.container.one('#addcancel').on('click', this.cancel_popup, this);
+            thisevent = this.container.one('#addcancel').on('click', this.cancel_popup, this);
+            this.listenevents.push(thisevent);
+            thisevent = bb.one('div.closebutton').on('click', this.cancel_popup, this);
+            this.listenevents.push(thisevent);
 
             // Grab global keyup events and handle them
-            Y.one('document').on('keyup', this.handle_key_press, this);
+            thisevent = Y.one('document').on('keyup', this.handle_key_press, this);
+            this.listenevents.push(thisevent);
 
             // Add references to various elements we adjust
             this.jumplink     = this.container.one('#jump');