From 29da6414db77512106250b9832a0b4a0168bd7eb Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 27 Apr 2009 03:36:26 -0400
Subject: [PATCH] - Updated TinyMCE to 3.2.3 version
---
program/js/tiny_mce/plugins/media/js/media.js | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/program/js/tiny_mce/plugins/media/js/media.js b/program/js/tiny_mce/plugins/media/js/media.js
index f04d5d9..86cfa98 100644
--- a/program/js/tiny_mce/plugins/media/js/media.js
+++ b/program/js/tiny_mce/plugins/media/js/media.js
@@ -183,7 +183,7 @@
tinyMCEPopup.restoreSelection();
if (!AutoValidator.validate(f)) {
- alert(ed.getLang('invalid_data'));
+ tinyMCEPopup.alert(ed.getLang('invalid_data'));
return false;
}
@@ -218,7 +218,7 @@
break;
}
- if (fe.width != f.width.value || fe.height != f.height.height)
+ if (fe.width != f.width.value || fe.height != f.height.value)
ed.execCommand('mceRepaint');
fe.title = serializeParameters();
@@ -359,7 +359,9 @@
d.getElementById('shockwave_options').style.display = 'none';
d.getElementById('wmp_options').style.display = 'none';
d.getElementById('rmp_options').style.display = 'none';
- d.getElementById(t + '_options').style.display = 'block';
+
+ if (t)
+ d.getElementById(t + '_options').style.display = 'block';
}
function serializeParameters() {
@@ -467,7 +469,7 @@
if (typeof(pl[n]) == "undefined")
return;
- document.forms[0].elements[p + "_" + n].checked = pl[n];
+ document.forms[0].elements[p + "_" + n].checked = pl[n] != 'false';
}
function setStr(pl, p, n) {
@@ -488,7 +490,7 @@
tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
- return (v == d) ? '' : n + (v ? ':' + tv + ',' : ':' + fv + ',');
+ return (v == d) ? '' : n + (v ? ':' + tv + ',' : ":\'" + fv + "\',");
}
function getStr(p, n, d) {
@@ -600,7 +602,7 @@
// Avoid annoying warning about insecure items
if (!tinymce.isIE || document.location.protocol != 'https:') {
- h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
+ h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
for (n in pl) {
h += '<param name="' + n + '" value="' + pl[n] + '">';
--
Gitblit v1.9.1