summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/js/fckeditor-2.6.js2
-rw-r--r--editors/js/whizzywig.js2
-rw-r--r--wysiwyg.js4
4 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a979df1..467b99f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 5.x-1.x, xxxx-xx-xx
---------------------------
+#367632 by sun: Fixed "Unexpected identifier, string or number" error in IE.
#367632 by sun: Fixed invalid JavaScript syntax.
#319363 by sun: Follow-up: Synced 1.x with 2.x where possible.
#364782 by sun: Fixed theme stylesheets not properly loaded.
diff --git a/editors/js/fckeditor-2.6.js b/editors/js/fckeditor-2.6.js
index 43c9c78..726f3d5 100644
--- a/editors/js/fckeditor-2.6.js
+++ b/editors/js/fckeditor-2.6.js
@@ -4,7 +4,7 @@
* Attach this editor to a target element.
*/
Drupal.wysiwyg.editor.attach.fckeditor = function(context, params, settings) {
- var FCKinstance = new FCKeditor(params.field, settings['Width'], settings['Height']);
+ var FCKinstance = new FCKeditor(params.field, settings.Width, settings.Height);
// Apply editor instance settings.
FCKinstance.BasePath = settings.EditorPath;
// Apply 'Wysiwyg' toolbar, if defined.
diff --git a/editors/js/whizzywig.js b/editors/js/whizzywig.js
index c4b1aa4..df02994 100644
--- a/editors/js/whizzywig.js
+++ b/editors/js/whizzywig.js
@@ -87,7 +87,7 @@ Drupal.wysiwyg.editor.detach.whizzywig = function(context, params) {
// Remove editor instance.
$('#' + whizzies[id] + '-whizzywig').remove();
whizzies.splice(id, 1);
- }
+ };
if (typeof params != 'undefined') {
for (var id in whizzies) {
diff --git a/wysiwyg.js b/wysiwyg.js
index 779524a..a73f720 100644
--- a/wysiwyg.js
+++ b/wysiwyg.js
@@ -174,8 +174,8 @@ Drupal.wysiwyg.getParams = function(element, params) {
// Convert format id into string.
params.format = 'format' + params.format;
// Convert numeric values.
- params.status = parseInt(params.status);
- params.resizable = parseInt(params.resizable);
+ params.status = parseInt(params.status, 10);
+ params.resizable = parseInt(params.resizable, 10);
return params;
};