summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2009-03-29 06:38:43 (GMT)
committer sun2009-03-29 06:38:43 (GMT)
commitdabc5f812902b22bad3ee166132848e1e2538ad7 (patch)
tree909e5c6e8d1af7c9270f4412710da114cd8c242b
parent294152ccb0c0d0a5ed81e41403f214c7e1042587 (diff)
#414768 by sun: Fixed Wysiwyg API not working in Konqueror.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--wysiwyg.js10
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 80fa73f..0eea6ca 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 7d736e2..57ee4bd 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);