Merge remote-tracking branch 'mpchadwick/develop' into MAGETWO-36267

Author: orlangur

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

@@ -58,7 +58,7 @@
             <td id="delete_button_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="option[delete][<%- data.id %>]" value="" />
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button title="<?php echo __('Delete') ?>" type="button"
+                    <button id="delete_button_<%- data.id %>" title="<?php echo __('Delete') ?>" type="button"
                         class="action- scalable delete delete-option"
                         >
                         <span><?php echo __('Delete') ?></span>
@@ -100,7 +100,6 @@ require([
             if (isNewOption && !this.isReadOnly) {
                 this.enableNewOptionDeleteButton(data.id);
             }
-            this.bindRemoveButtons();
             this.itemCount++;
             this.totalItems++;
             this.updateItemsCountField();
@@ -139,22 +138,16 @@ require([
                 button.removeClassName('disabled');
             });
         },
-        bindRemoveButtons: function() {
-            var buttons = $$('.delete-option');
-            for (var i = 0; i < buttons.length; i++) {
-                if (!$(buttons[i]).binded) {
-                    $(buttons[i]).binded = true;
-                    Event.observe(buttons[i], 'click', this.remove.bind(this));
-                }
-            }
-        }
     };
 
-    attributeOption.bindRemoveButtons();
-
     if ($('add_new_option_button')) {
         Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption));
     }
+    
+    $('manage-options-panel').on('click', '.delete-option', function(event, element) {
+        attributeOption.remove(event);
+    });
+
     <?php foreach ($block->getOptionValues() as $_value): ?>
     attributeOption.add(<?php echo $_value->toJson() ?>);
     <?php endforeach; ?>