CRM-16354 - Use standard crm-form css class for wysiwyg

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index e102fd8e39845659369fce2b31a944d2ec036874..4bddc368b013d3a9baf264504e2140cc7709eea9 100644 (file)
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -272,11 +272,8 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
     $attributes = '', $required = FALSE, $extra = NULL
   ) {
     if ($type == 'wysiwyg') {
-      if ($attributes === '') {
-        $attributes = array();
-      }
-      $attributes = ((array) $attributes) + array('class' => '');
-      $attributes['class'] .= ' crm-wysiwyg';
+      $attributes = ($attributes ? $attributes : array()) + array('class' => '');
+      $attributes['class'] .= ' crm-form-wysiwyg';
       $type = "textarea";
     }
     if ($type == 'select' && is_array($extra)) {

diff --git a/js/Common.js b/js/Common.js
index 2781a736830d8ea304e5dc101b90b0a1c402338f..87a38e126904ae80a2f439ab5e20b74359987693 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -834,7 +834,7 @@ CRM.strings = CRM.strings || {};
       $('form[data-warn-changes] :input', e.target).each(function() {
         $(this).data('crm-initial-value', $(this).is(':checkbox, :radio') ? $(this).prop('checked') : $(this).val());
       });
-      $('textarea.crm-wysiwyg', e.target)
+      $('textarea.crm-form-wysiwyg', e.target)
         .not('.crm-wysiwyg-enabled')
         .addClass('crm-wysiwyg-enabled')
         .each(function() {