diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 80fa73f1996cfc3ee05deab29981201655b45a15..0eea6ca5bbee375d7ec9f8a896cc3539a5a33ceb 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx Wysiwyg 5.x-2.x, xxxx-xx-xx --------------------------- +#414768 by sun: Fixed Wysiwyg API not working in Konqueror. #416742 by sun: Fixed type casting of $profile in profile configuration form. #404532 by TwoD: Fixed Teaser break comment stripped in IE. #380698 by TwoD: Added Drupal plugin support for FCKeditor. diff --git a/wysiwyg.js b/wysiwyg.js index 7d736e23d1753ec336bd89046f7875d1fe6bb93c..57ee4bd504b9dc5a20f5c802c616f56a2babb633 100644 --- a/wysiwyg.js +++ b/wysiwyg.js @@ -7,6 +7,11 @@ * init hook gives them a chance to do so. */ Drupal.wysiwygInit = function() { + // This breaks in Konqueror. Prevent it from running. + if (/KDE/.test(navigator.vendor)) { + return; + } + jQuery.each(Drupal.wysiwyg.editor.init, function(editor) { // Clone, so original settings are not overwritten. this(Drupal.wysiwyg.clone(Drupal.settings.wysiwyg.configs[editor])); @@ -33,6 +38,11 @@ Drupal.wysiwygInit = function() { * A DOM element, supplied by Drupal.attachBehaviors(). */ Drupal.behaviors.attachWysiwyg = function(context) { + // This breaks in Konqueror. Prevent it from running. + if (/KDE/.test(navigator.vendor)) { + return; + } + $('.wysiwyg:not(.wysiwyg-processed)', context).each(function() { var params = Drupal.wysiwyg.getParams(this); var $this = $(this);