From 5f34e50b0731d560dd51e33de112327e1ab132d1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 18 Mar 2014 13:37:51 -0400
Subject: [PATCH] CRM-10693 - js fixes

---
 js/Common.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/Common.js b/js/Common.js
index 4e3f876a4a..f16aba4844 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -420,8 +420,8 @@ CRM.validate = CRM.validate || {
           target.toggleClass('crm-row-selected', $(this).is(':checked'));
         })
         .find('input.select-row:checked').parents('tr').addClass('crm-row-selected');
-      $('.crm-select2:not(.select2-offscreen)', e.target).crmSelect2();
-      $('.crm-form-entityref:not(.select2-offscreen)', e.target).crmEntityRef();
+      $('.crm-select2:not(.select2-offscreen, .select2-container)', e.target).crmSelect2();
+      $('.crm-form-entityref:not(.select2-offscreen, .select2-container)', e.target).crmEntityRef();
     })
     // Modal dialogs should disable scrollbars
     .on('dialogopen', function(e) {
@@ -647,7 +647,7 @@ CRM.validate = CRM.validate || {
       modal: true,
       width: 'auto',
       close: function () {
-        $(dialog).remove();
+        $(dialog).dialog('destroy').remove();
       },
       buttons: {}
     };
@@ -672,8 +672,8 @@ CRM.validate = CRM.validate || {
     });
     dialog = $('<div class="crm-container crm-confirm-dialog"></div>')
       .html(options.message)
-      .appendTo('body')
-      .dialog(settings);
+      .dialog(settings)
+      .trigger('crmLoad');
     return dialog;
   };
 
-- 
2.25.1