From b8d5d263d25057eaf1b393d552ed997ebb284179 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 5 Mar 2014 13:26:03 -0500
Subject: [PATCH] CRM-10693 - Trigger events and support drupal wysiwyg in
 popups

---
 templates/CRM/common/additionalBlocks.tpl |  4 +---
 templates/CRM/common/customData.tpl       | 10 ++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/templates/CRM/common/additionalBlocks.tpl b/templates/CRM/common/additionalBlocks.tpl
index 68bc99a316..015ef5a152 100644
--- a/templates/CRM/common/additionalBlocks.tpl
+++ b/templates/CRM/common/additionalBlocks.tpl
@@ -80,9 +80,7 @@ function buildAdditionalBlocks( blockName, className ) {
         async   : false,
         success : function(html){
             cj(fname).after(html);
-            if ((typeof(Drupal) != 'undefined') && Drupal.attachBehaviors) {
-              Drupal.attachBehaviors(cj('#' + blockName + '_Block_'+ currentInstance)[0]);
-            }
+            cj(fname).next().trigger('crmLoad');
         }
     });
 
diff --git a/templates/CRM/common/customData.tpl b/templates/CRM/common/customData.tpl
index 941003430c..1764975b1a 100644
--- a/templates/CRM/common/customData.tpl
+++ b/templates/CRM/common/customData.tpl
@@ -29,9 +29,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-var CRM = CRM || {};
-CRM.buildCustomData = function( type, subType, subName, cgCount, groupID, isMultiple )
-{
+CRM.buildCustomData = function( type, subType, subName, cgCount, groupID, isMultiple ) {
   var dataUrl = {/literal}"{crmURL p=$urlPath h=0 q='snippet=4&type='}"{literal} + type;
 
   if ( subType ) {
@@ -108,12 +106,12 @@ CRM.buildCustomData = function( type, subType, subName, cgCount, groupID, isMult
           cj('textarea', this).each(function() {
             cj(this).text(cj(this).val());
           });
-          cj('option:selected', this).prop('selected', true);
-          cj('option:not(:selected)', this).prop('selected', false);
+          cj('option:selected', this).attr('selected', 'selected');
+          cj('option:not(:selected)', this).removeAttr('selected');
           storage[id] = cj(this).detach();
         }
       });
-      target.html(response);
+      target.html(response).trigger('crmLoad');
       target.children().each(function() {
         var id = cj(this).attr('id');
         if (id && storage[id]) {
-- 
2.25.1