Changeset 2d4173 in indico

Timestamp:

12/01/11 13:38:15 (18 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

8f8e4d

Parents:

d8c61c

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (07/11/11 17:34:30)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (12/01/11 13:38:15)

Message:

[IMP] Allow closing the dialog using escape

File:

• indico/htdocs/js/indico/Core/Dialogs/Popup.js (modified) (2 diffs)

indico/htdocs/js/indico/Core/Dialogs/Popup.js

@@ -97 +97 @@
                 modal: true,
                 resizable: false,
-                closeOnEscape: false,
+                closeOnEscape: true,
                 title: this.title,
                 minWidth: '250px',
@@ -116 +116 @@
         // Close button clicked
         if(e.originalEvent && $(e.originalEvent.currentTarget).hasClass('ui-dialog-titlebar-close')) {
+            if(isFunction(this.closeHandler) && !this.closeHandler()) {
+                return false;
+            }
+        }
+        // Escape key
+        else if(e.keyCode && e.keyCode === $.ui.keyCode.ESCAPE) {
+            e.stopPropagation(); // otherwise this triggers twice for some reason
+            if(this.closeHandler === null || !this.showCloseButton) {
+                // Ignore escape if we don't have a close button
+                return false;
+            }
             if(isFunction(this.closeHandler) && !this.closeHandler()) {
                 return false;