Merge pull request #9415 from lcdservices/CRM-19668

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

diff --git a/js/crm.optionEdit.js b/js/crm.optionEdit.js
index 7a343e2154ba6a3c91a4a9291210e1ea74b07ddd..5f8c48342864b3e19329b1861dc251cd3a1b2981 100644 (file)
--- a/js/crm.optionEdit.js
+++ b/js/crm.optionEdit.js
@@ -1,23 +1,16 @@
 // https://civicrm.org/licensing
-// Enable administrators to edit option lists in a dialog
 jQuery(function($) {
-  var optionsChanged;
   $('body')
-    // Edit option lists
+    // Enable administrators to edit option lists in a dialog
     .on('click', 'a.crm-option-edit-link', CRM.popup)
-    .on('crmPopupOpen crmPopupFormSuccess', 'a.crm-option-edit-link', function(e) {
-      optionsChanged = e.type === 'crmPopupFormSuccess';
-    })
-    .on('crmPopupClose', 'a.crm-option-edit-link', function() {
-      if (optionsChanged) {
-        $(this).trigger('crmOptionsEdited');
-        var $elects = $('select[data-option-edit-path="' + $(this).data('option-edit-path') + '"]');
-        if ($elects.data('api-entity') && $elects.data('api-field')) {
-          CRM.api3($elects.data('api-entity'), 'getoptions', {sequential: 1, field: $elects.data('api-field')})
-            .done(function (data) {
-              CRM.utils.setOptions($elects, data.values);
-            });
-        }
+    .on('crmPopupFormSuccess', 'a.crm-option-edit-link', function() {
+      $(this).trigger('crmOptionsEdited');
+      var $elects = $('select[data-option-edit-path="' + $(this).data('option-edit-path') + '"]');
+      if ($elects.data('api-entity') && $elects.data('api-field')) {
+        CRM.api3($elects.data('api-entity'), 'getoptions', {sequential: 1, field: $elects.data('api-field')})
+          .done(function (data) {
+            CRM.utils.setOptions($elects, data.values);
+          });
       }
-    })
+    });
 });