Merge pull request #7065 from colemanw/wysiwyg

[civicrm-core.git] / js / crm.livePage.js

diff --git a/js/crm.livePage.js b/js/crm.livePage.js
index a47145cb41b037909d7d4cd203962f252f5864c1..35c8b39312dd7cc3a333c4d5dc255b364798e929 100644 (file)
--- a/js/crm.livePage.js
+++ b/js/crm.livePage.js
@@ -1,17 +1,12 @@
 // http://civicrm.org/licensing
 // Adds ajaxy behavior to a simple CiviCRM page
-cj(function($) {
+CRM.$(function($) {
+  var active = 'a.button, a.action-item:not(.crm-enable-disable), a.crm-popup';
   $('#crm-main-content-wrapper')
     // Widgetize the content area
     .crmSnippet()
     // Open action links in a popup
-    .off('click.crmLivePage')
-    .on('click.crmLivePage', 'a.button, a.action-item', function() {
-      return !$(this).crmPopup({
-        crmFormSuccess: function() {
-          // Refresh page when form completes
-          $('#crm-main-content-wrapper').crmSnippet('refresh');
-        }
-      });
-    });
+    .off('.crmLivePage')
+    .on('click.crmLivePage', active, CRM.popup)
+    .on('crmPopupFormSuccess.crmLivePage', active, CRM.refreshParent);
 });