Merge pull request #6540 from avalonmediasystem/develop

Avalon 8.1 RC3

Author: joncameron

app/assets/javascripts/button_confirmation.js

@@ -42,28 +42,28 @@ window.apply_button_confirmation = function () {
       }
     });
   });
+};
 
-  if (popoverList.length !== 0) {
-    $(document).on('click', '#special_button_color', function (e) {
-      // Stop page from scrolling up on 'Cancel' click
-      e.preventDefault();
-      // Restore focus to the active delete button
-      if (activeDeleteBtn) {
-        bootstrap.Popover.getInstance(activeDeleteBtn).hide();
-        activeDeleteBtn.focus();
-      }
-      return true;
-    });
+// Initialize the cancel button within the popover
+$(document).on('click', '#special_button_color', function (e) {
+  // Stop page from scrolling up on 'Cancel' click
+  e.preventDefault();
+  // Restore focus to the active delete button
+  if (activeDeleteBtn) {
+    bootstrap.Popover.getInstance(activeDeleteBtn).hide();
+    activeDeleteBtn.focus();
+  }
+  return true;
+});
 
-    $(document).on('confirm', '.btn-confirmation', function(e) {
-      if (activeDeleteBtn) {
-        bootstrap.Popover.getInstance(activeDeleteBtn).hide();
-      }
-      bootstrap.Popover.getInstance(e.target).show();
-      return false;
-    });
+// 'confirm' is an event generated by rails
+$(document).on('confirm', '.btn-confirmation', function(e) {
+  if (activeDeleteBtn) {
+    bootstrap.Popover.getInstance(activeDeleteBtn).hide();
   }
-};
+  bootstrap.Popover.getInstance(e.target).show();
+  return false;
+});
 // END: 'apply_button_confirmation' coffeescript to javascript conversion
 
 // After showing the popover, focus the first button inside it for keyboard accessibility