From ceab24db2a7bf459684a650c287770b4ff090f54 Mon Sep 17 00:00:00 2001 From: brettp Date: Tue, 7 Jun 2011 22:46:47 +0000 Subject: Refs #3510, #9113. Updated tinyMCE version in trunk. git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../jscripts/tiny_mce/plugins/style/js/props.js | 10 +- .../tiny_mce/plugins/style/langs/en_dlg.js | 9 +- .../jscripts/tiny_mce/plugins/style/props.htm | 911 ++++++++++++--------- 3 files changed, 523 insertions(+), 407 deletions(-) (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style') diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js index a8dd93dec..c8e160424 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js +++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js @@ -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; diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js index 5026313e2..df0a173c7 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js +++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js @@ -59,5 +59,12 @@ visibility:"Visibility", zindex:"Z-index", overflow:"Overflow", placement:"Placement", -clip:"Clip" +clip:"Clip", +text:"Text", +background:"Background", +block:"Block", +box:"Box", +border:"Border", +list:"List", +position:"Position" }); \ No newline at end of file diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm index 549ed0408..b5a3d15d9 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm @@ -10,277 +10,317 @@ - + +

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

{#style_dlg.text_font}

- -

{#style_dlg.text_size}

- - - - - - -

-

{#style_dlg.text_weight}

- -

{#style_dlg.text_style}

- -

{#style_dlg.text_variant}

- -

{#style_dlg.text_lineheight}

- - - - - - -

- -

-

{#style_dlg.text_case}

- -

{#style_dlg.text_color}

- - - - - -

-

{#style_dlg.text_decoration}

- - - - - - - - - - - - - - - - - - - - - -

	{#style_dlg.text_underline}
	{#style_dlg.text_overline}
	{#style_dlg.text_striketrough}
	{#style_dlg.text_blink}
	{#style_dlg.text_none}

-

+

+ {#style_dlg.text} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

{#style_dlg.text_font}

+ +

{#style_dlg.text_size}

+ + + + + + +

+ + +

+

{#style_dlg.text_weight}

+ +

{#style_dlg.text_style}

+ +

{#style_dlg.text_variant}

+ +

{#style_dlg.text_lineheight}

+ + + + + + +

+ +

+ + +

+

{#style_dlg.text_case}

+ +

{#style_dlg.text_color}

+ + + + + +

+

{#style_dlg.text_decoration}

+ + + + + + + + + + + + + + + + + + + + + +

{#style_dlg.text_underline}

{#style_dlg.text_overline}

{#style_dlg.text_striketrough}

{#style_dlg.text_blink}

{#style_dlg.text_none}

+

+

- - - - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + +

{#style_dlg.background_color}

- - - - +

+ {#style_dlg.background} +

+ + + + + + + + - +

{#style_dlg.background_color}

+ + + + + +

+

{#style_dlg.background_image}

+ + + -

-

+

{#style_dlg.background_image}

- - - - -

-

{#style_dlg.background_repeat}

{#style_dlg.background_repeat}

{#style_dlg.background_attachment}

{#style_dlg.background_attachment}

{#style_dlg.background_hpos}

+ + + + + + +

+ + +

+

{#style_dlg.background_hpos}

- - - - - - -

-

{#style_dlg.background_vpos}

+ + + + + - - - -

-

{#style_dlg.background_vpos}

- - - - - - -

-

+ +

+ + + +

- - - - - +

+ {#style_dlg.block} +

{#style_dlg.block_wordspacing}

- - - - - - -

-

+ + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - -

{#style_dlg.block_wordspacing}

+ + + + + + +

+ + +

+

{#style_dlg.block_letterspacing}

- - - - - - -

-

{#style_dlg.block_letterspacing}

+ + + + + + +

+ + +

+

{#style_dlg.block_vertical_alignment}

{#style_dlg.block_vertical_alignment}

{#style_dlg.block_text_align}

{#style_dlg.block_text_align}

{#style_dlg.block_text_indent}

- - - - - - -

-

{#style_dlg.block_text_indent}

+ + + + + - - - + + + +

+ -

{#style_dlg.block_whitespace}

+

{#style_dlg.block_display}

+ + {#style_dlg.block_whitespace} + + + + + {#style_dlg.block_display} + + + +