From a6292dd0fecd4482fe863ed849d126b5281b1a8a Mon Sep 17 00:00:00 2001 From: hukl Date: Wed, 9 Sep 2009 12:07:57 +0200 Subject: huge tiny_mce update - now using the tiny_mce jquery build which allows tiny_mce to be initialized via jquery - great! --- public/javascripts/tiny_mce/plugins/media/js/embed.js | 0 public/javascripts/tiny_mce/plugins/media/js/media.js | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 public/javascripts/tiny_mce/plugins/media/js/embed.js mode change 100755 => 100644 public/javascripts/tiny_mce/plugins/media/js/media.js (limited to 'public/javascripts/tiny_mce/plugins/media/js') diff --git a/public/javascripts/tiny_mce/plugins/media/js/embed.js b/public/javascripts/tiny_mce/plugins/media/js/embed.js old mode 100755 new mode 100644 diff --git a/public/javascripts/tiny_mce/plugins/media/js/media.js b/public/javascripts/tiny_mce/plugins/media/js/media.js old mode 100755 new mode 100644 index fa8e142..86cfa98 --- a/public/javascripts/tiny_mce/plugins/media/js/media.js +++ b/public/javascripts/tiny_mce/plugins/media/js/media.js @@ -218,7 +218,7 @@ function insertMedia() { 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(); @@ -469,7 +469,7 @@ function setBool(pl, p, n) { 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) { @@ -490,7 +490,7 @@ function getBool(p, n, d, tv, fv) { 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) { -- cgit v1.3