Merge pull request #6394 from colemanw/CRM-14599

[civicrm-core.git] / js / wysiwyg / crm.ckeditor.js

diff --git a/js/wysiwyg/crm.ckeditor.js b/js/wysiwyg/crm.ckeditor.js
index f42ab23319713c4383cb349df82d6a8e8c82b1b8..5d418e57b39a93cb942ebf42eab332c54918e72c 100644 (file)
--- a/js/wysiwyg/crm.ckeditor.js
+++ b/js/wysiwyg/crm.ckeditor.js
@@ -16,15 +16,20 @@
       browseUrl = CRM.config.userFrameworkResourceURL + "packages/kcfinder/browse.php?cms=civicrm",
       uploadUrl = CRM.config.userFrameworkResourceURL + "packages/kcfinder/upload.php?cms=civicrm";
     if ($(item).length) {
-      editor = CKEDITOR.replace($(item)[0]);
+      editor = CKEDITOR.replace($(item)[0], {
+        filebrowserBrowseUrl: browseUrl + '&type=files',
+        filebrowserImageBrowseUrl: browseUrl + '&type=images',
+        filebrowserFlashBrowseUrl: browseUrl + '&type=flash',
+        filebrowserUploadUrl: uploadUrl + '&type=files',
+        filebrowserImageUploadUrl: uploadUrl + '&type=images',
+        filebrowserFlashUploadUrl: uploadUrl + '&type=flash',
+        customConfig: CRM.config.CKEditorCustomConfig
+      });
     }
     if (editor) {
-      editor.config.filebrowserBrowseUrl = browseUrl + '&type=files';
-      editor.config.filebrowserImageBrowseUrl = browseUrl + '&type=images';
-      editor.config.filebrowserFlashBrowseUrl = browseUrl + '&type=flash';
-      editor.config.filebrowserUploadUrl = uploadUrl + '&type=files';
-      editor.config.filebrowserImageUploadUrl = uploadUrl + '&type=images';
-      editor.config.filebrowserFlashUploadUrl = uploadUrl + '&type=flash';
+      editor.on('focus', function() {
+        $(item).trigger('focus');
+      });
       editor.on('blur', function() {
         editor.updateElement();
         $(item).trigger("blur");