summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2010-02-13 23:57:52 (GMT)
committer sun2010-02-13 23:57:52 (GMT)
commita378343569dffb6f7b685ffc976e77800e2b90b8 (patch)
treefd61ce341f8d9d0c008668181f748480a45db88c
parentef86e943d1399fea6ef9ecfed5d49d3445f8a12e (diff)
Syncing all branches.
-rw-r--r--CHANGELOG.txt8
-rw-r--r--plugins/break/break.js3
2 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5619b15..f09497b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,9 +6,6 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 7.x-3.x, xxxx-xx-xx
---------------------------
-#582298 by dereine: Added auto-paste from Word detection for FCKeditor.
-#597852 by sun: Fixed missing Turkish in language list.
-#620176 by sun: Fixed missing Ukrainian in language list.
#612954 by TwoD: Fixed broken editor settings.
#585932 by sun: Ported to Drupal 7.
@@ -25,6 +22,11 @@ Wysiwyg 6.x-3.x, xxxx-xx-xx
#695768 by sun: Fixed #resizable removed when no editor profiles are loaded.
#631494 by TwoD: Fixed multi-site libraries directory failure for WYMeditor.
#660080 by TwoD: Fixed Notice: Undefined offset.
+#613922 by TwoD, sun: Fixed PHP warning when saving profiles.
+#582298 by dereine: Added auto-paste from Word detection for FCKeditor.
+#597852 by sun: Fixed missing Turkish in language list.
+#620176 by sun: Fixed missing Ukrainian in language list.
+#613480 by TwoD, Dave Reid: Fixed PHP 5.3 compatibility.
#462146 by TwoD: Cleaned up CKEditor implementation.
#380586 by SimonEast: Updated YUI editor: Version detection not working.
#610132 by TwoD: Updated CKEditor 3.0.1, stylesheets and version check.
diff --git a/plugins/break/break.js b/plugins/break/break.js
index 649759f..5f0ea63 100644
--- a/plugins/break/break.js
+++ b/plugins/break/break.js
@@ -1,6 +1,6 @@
// $Id$
-
(function ($) {
+
// @todo Array syntax required; 'break' is a predefined token in JavaScript.
Drupal.wysiwyg.plugins['break'] = {
@@ -65,4 +65,5 @@ Drupal.wysiwyg.plugins['break'] = {
return '<img src="' + settings.path + '/images/spacer.gif" alt="&lt;--break-&gt;" title="&lt;--break--&gt;" class="wysiwyg-break drupal-content" />';
}
};
+
})(jQuery);