\r
f.box_height.value = getNum(ce.style.height);\r
selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));\r
-\r
- if (tinymce.isGecko)\r
- selectByValue(f, 'box_float', ce.style.cssFloat, true, true);\r
- else\r
- selectByValue(f, 'box_float', ce.style.styleFloat, true, true);\r
+ selectByValue(f, 'box_float', ce.style.cssFloat || ce.style.styleFloat, true, true);\r
\r
selectByValue(f, 'box_clear', ce.style.clear, true, true);\r
\r
generateCSS();\r
\r
tinyMCEPopup.restoreSelection();\r
- ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));\r
+ ed.dom.setAttrib(ed.selection.getSelectedBlocks(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));\r
}\r
\r
function updateAction() {\r
ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");\r
ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");\r
ce.style.styleFloat = f.box_float.value;\r
-\r
- if (tinymce.isGecko)\r
- ce.style.cssFloat = f.box_float.value;\r
+ ce.style.cssFloat = f.box_float.value;\r
\r
ce.style.clear = f.box_clear.value;\r
\r