From 35df910c5decdbd18b23d9e7fc23842364b5eb33 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 30 Mar 2014 14:30:47 -0400
Subject: [PATCH] Tweak to CRM.popup

---
 js/crm.ajax.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index 6808f217cf..63c18b5503 100644
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -408,14 +408,14 @@
    * Handler for jQuery click event e.g. $('a').click(CRM.popup)
    * @returns {boolean}
    */
-  CRM.popup = function() {
+  CRM.popup = function(e) {
     var $el = $(this).first(),
       url = $el.attr('href'),
       popup = $el.data('popup-type') === 'page' ? CRM.loadPage : CRM.loadForm,
       settings = $el.data('popup-settings') || {},
       triggers = {dialogclose: 'crmPopupClose', crmLoad: 'crmPopupLoad', crmFormSuccess: 'crmPopupFormSuccess'};
     settings.dialog = settings.dialog || {};
-    if (!CRM.config.ajaxPopupsEnabled || !url || $el.is(exclude)) {
+    if (e.isDefaultPrevented() || !CRM.config.ajaxPopupsEnabled || !url || $el.is(exclude)) {
       return;
     }
     // Sized based on css class
@@ -437,7 +437,7 @@
         $el.trigger(target, [dialog, data]);
       });
     });
-    return false;
+    e.preventDefault();
   };
 
   $(function($) {
-- 
2.25.1