public/javascripts/tinymce/plugins/style/js/props.js in spree_editor-0.50.0 vs public/javascripts/tinymce/plugins/style/js/props.js in spree_editor-0.50.1
- old
+ new
@@ -175,16 +175,12 @@
f.box_width.value = getNum(ce.style.width);
selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));
f.box_height.value = getNum(ce.style.height);
selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
+ selectByValue(f, 'box_float', ce.style.cssFloat || ce.style.styleFloat, true, true);
- 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_clear', ce.style.clear, true, true);
setupBox(f, ce, 'box_padding', 'padding', '');
setupBox(f, ce, 'box_margin', 'margin', '');
@@ -438,12 +434,10 @@
// Build box styles
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;
if (!f.box_padding_same.checked) {
ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");