Merge pull request #8101 from colemanw/CRM-18379

[civicrm-core.git] / js / wysiwyg / admin.ckeditor-configurator.js

diff --git a/js/wysiwyg/admin.ckeditor-configurator.js b/js/wysiwyg/admin.ckeditor-configurator.js
index 0ebbb59373bd3e90809dc7d4b3136646489331b4..64bfef02774b0170c0d7238cdfaa323adcebebd0 100644 (file)
--- a/js/wysiwyg/admin.ckeditor-configurator.js
+++ b/js/wysiwyg/admin.ckeditor-configurator.js
@@ -28,17 +28,11 @@
 
   CKEDITOR.document.getById( 'toolbarModifierWrapper' ).append( toolbarModifier.mainContainer );
 
-  $('.toolbar button:last', '#toolbarModifierWrapper').hide();
-
   $(function() {
     var selectorOpen = false,
       changedWhileOpen = false;
 
     $('#toolbarModifierForm')
-      // The buttons in the configurator are not submit buttons!
-      .on('click', 'button', function(e) {
-        e.preventDefault();
-      })
       .on('submit', function(e) {
         $('.toolbar button:last', '#toolbarModifierWrapper')[0].click();
         $('.configContainer textarea', '#toolbarModifierWrapper').attr('name', 'config');
@@ -62,4 +56,4 @@
       });
   });
 
-})(CRM.$, CRM._);
\ No newline at end of file
+})(CRM.$, CRM._);