CRM-19649 - Fix wysiwyg defaults

diff --git a/CRM/Admin/Page/CKEditorConfig.php b/CRM/Admin/Page/CKEditorConfig.php
index 1b42dee2b45b620ec685421c8761bc7f9a6cf237..f1018bed7e0ed43a10fbf66b9e07f786b0837258 100644 (file)
--- a/CRM/Admin/Page/CKEditorConfig.php
+++ b/CRM/Admin/Page/CKEditorConfig.php
@@ -135,7 +135,7 @@ class CRM_Admin_Page_CKEditorConfig extends CRM_Core_Page {
     foreach ($params as $key => $val) {
       $val = trim($val);
       if (strpos($key, 'config_') === 0 && strlen($val)) {
-        if ($val != 'true' && $val != 'false' && $val[0] != '{' && $val[0] != '[' && !is_numeric($val)) {
+        if ($val != 'true' && $val != 'false' && $val != 'null' && $val[0] != '{' && $val[0] != '[' && !is_numeric($val)) {
           $val = json_encode($val);
         }
         $pos = strrpos($config, '};');
@@ -206,6 +206,9 @@ class CRM_Admin_Page_CKEditorConfig extends CRM_Core_Page {
   private function getConfigSettings() {
     $matches = $result = array();
     $file = self::getConfigFile($this->preset);
+    if (!$file) {
+      $file = self::getConfigFile('default');
+    }
     $result['skin'] = 'moono';
     if ($file) {
       $contents = file_get_contents($file);

diff --git a/js/wysiwyg/admin.ckeditor-configurator.js b/js/wysiwyg/admin.ckeditor-configurator.js
index dc576f3526f3be200e0575999606eda869bae388..17ac199703dd30e823507c46ac1b6bc67717b8c5 100644 (file)
--- a/js/wysiwyg/admin.ckeditor-configurator.js
+++ b/js/wysiwyg/admin.ckeditor-configurator.js
@@ -44,7 +44,7 @@
         $el.after('<span>&nbsp; = &nbsp;<select class="crm-form-select" name="config_' + name + '"><option value="false">false</option><option value="true">true</option></select></span>');
       }
       else {
-        $el.after('<span>&nbsp; = &nbsp;<input class="crm-form-text huge" type="' + (type==='Number' ? 'number' : 'text') + '" name="config_' + name + '" /></span>');
+        $el.after('<span>&nbsp; = &nbsp;<input class="crm-form-text ' + (type==='Number' ? 'eight" type="number"' : 'huge" type="text"') + ' name="config_' + name + '"/></span>');
       }
     } else {
       $el.closest('div').remove();