summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Danielsson2011-02-12 19:34:28 (GMT)
committer Henrik Danielsson2011-02-12 19:34:28 (GMT)
commit117b5e4e85f65bba8e60c14bc80a7b202e6f1035 (patch)
treed6b94e71a9a58509ec7a397ab7a58a0255616b8b
parenta64a670788b2e6f25cf0c5fb2aca69f2537baee1 (diff)
#1009880 by AndyF: Fixed another CKEditor selection handling issue.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/js/ckeditor-3.0.js5
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3b1dbf7..0d2d32b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@
Wysiwyg 6.x-2.x, xxxx-xx-xx
---------------------------
+#1009880 by AndyF: Fixed another CKEditor selection handling issue.
#1048556 by cousin_itt, TwoD: Fixed TinyMCE insertdatetime plugin setting.
#1036900 by mattyoung: Minor code clean-up in wysiwyg_tinymce_version().
diff --git a/editors/js/ckeditor-3.0.js b/editors/js/ckeditor-3.0.js
index 62630f1..6526011 100644
--- a/editors/js/ckeditor-3.0.js
+++ b/editors/js/ckeditor-3.0.js
@@ -111,8 +111,9 @@ Drupal.wysiwyg.editor.attach.ckeditor = function(context, params, settings) {
},
selectionChange: function (event) {
- if (Drupal.settings.wysiwyg.plugins[params.format]) {
- $.each(Drupal.settings.wysiwyg.plugins[params.format].drupal, function (name) {
+ var pluginSettings = Drupal.settings.wysiwyg.plugins[params.format];
+ if (pluginSettings && pluginSettings.drupal) {
+ $.each(pluginSettings.drupal, function (name) {
var plugin = Drupal.wysiwyg.plugins[name];
if ($.isFunction(plugin.isNode)) {
var node = event.data.selection.getSelectedElement();