summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Danielsson2010-09-25 00:47:20 (GMT)
committer Henrik Danielsson2010-09-25 00:47:20 (GMT)
commit519b3efbe29bc0035b6c7c03c8ffc0e6db1f42d0 (patch)
tree7c915ea11e37e5017fc93cf09736b4b8453be6c3
parenteb9454a865e4025cc2cf662ab7b84f630fe08dc0 (diff)
#593008 by TwoD: Fixed third-party scripts breaking Wysiwyg.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--wysiwyg.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 799cdf1..a2ddadc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-2.x, xxxx-xx-xx
---------------------------
+#593008 by TwoD: Fixed third-party scripts breaking Wysiwyg.
#695398 by RichieB, Cl1mh4224rd, mcpuddin: Fixed TinyMCE 3.3.9.1 detection.
#737318 by dboune: Fixed CKEditor default skin depends on filesystem order.
#775608 by TwoD: Fixed FCKEditor crashes IE on save.
diff --git a/wysiwyg.js b/wysiwyg.js
index 7579ded..7a96f11 100644
--- a/wysiwyg.js
+++ b/wysiwyg.js
@@ -195,7 +195,7 @@ Drupal.wysiwygAttachToggleLink = function(context, params) {
Drupal.wysiwyg.getParams = function(element, params) {
var classes = element.className.split(' ');
var params = params || {};
- for (var i in classes) {
+ for (var i = 0; i < classes.length; i++) {
if (classes[i].substr(0, 8) == 'wysiwyg-') {
var parts = classes[i].split('-');
var value = parts.slice(2).join('-');