oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade TinyMCE to 3.4.2, fixes bugs 11955, 11992

Browse source
This commit is contained in:
Colin Kuskie 2011-04-11 15:05:42 -07:00
parent faddfc5d8a
commit 38de00f931
422 changed files with 17224 additions and 23491 deletions
Download patch file Download diff file Expand all files Collapse all files

10
www/extras/tinymce/jscripts/tiny_mce/plugins/style/js/props.js vendored
View file

@ -177,11 +177,7 @@ function setupFormData() {
f.box_height.value = getNum(ce.style.height);
selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
if (tinymce.isGecko)
selectByValue(f, 'box_float', ce.style.cssFloat, true, true);
else
selectByValue(f, 'box_float', ce.style.styleFloat, true, true);
selectByValue(f, 'box_float', ce.style.cssFloat || ce.style.styleFloat, true, true);
selectByValue(f, 'box_clear', ce.style.clear, true, true);
@ -440,9 +436,7 @@ function generateCSS() {
ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
ce.style.styleFloat = f.box_float.value;
if (tinymce.isGecko)
ce.style.cssFloat = f.box_float.value;
ce.style.cssFloat = f.box_float.value;
ce.style.clear = f.box_clear.value;