From 832369eb5801c43796ac580552ff49f5b8e72310 Mon Sep 17 00:00:00 2001 From: Stanislas Rolland Date: Mon, 25 Oct 2010 15:10:11 +0000 Subject: [PATCH] Fixed bug #16087: htmlArea RTE: Missing soft hyphen entity in CharacterMap git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9199 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 4 ++++ typo3/sysext/rtehtmlarea/ChangeLog | 4 ++++ .../htmlarea/plugins/CharacterMap/character-map.js | 7 +++---- .../sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css | 3 ++- typo3/sysext/t3skin/rtehtmlarea/htmlarea.css | 3 ++- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72b14e549cc..12903f17c83 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-10-25 Stanislas Rolland + + * Fixed bug #16087: htmlArea RTE: Missing soft hyphen entity in CharacterMap + 2010-10-24 Stanislas Rolland * Added feature #16118: htmlArea RTE: cleanup/rewrite DOM to html rendering diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog index d6a9c1d208b..0daec878deb 100644 --- a/typo3/sysext/rtehtmlarea/ChangeLog +++ b/typo3/sysext/rtehtmlarea/ChangeLog @@ -1,3 +1,7 @@ +2010-10-25 Stanislas Rolland + + * Fixed bug #16087: htmlArea RTE: Missing soft hyphen entity in CharacterMap + 2010-10-24 Stanislas Rolland * Added feature #16118: htmlArea RTE: cleanup/rewrite DOM to html rendering diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/CharacterMap/character-map.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/CharacterMap/character-map.js index 68ef296694d..4f583dff580 100644 --- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/CharacterMap/character-map.js +++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/CharacterMap/character-map.js @@ -148,6 +148,7 @@ HTMLArea.CharacterMap = HTMLArea.Plugin.extend({ ['˜', '˜'], ['¨', '¨'], ['¸', '¸'], + ['­', '­'], ['–', '–'], ['—', '—'], ['‘', '‘'], @@ -297,8 +298,7 @@ HTMLArea.CharacterMap = HTMLArea.Plugin.extend({ ['Ψ', 'Ψ'], ['ψ', 'ψ'], ['Ω', 'Ω'], - ['ω', 'ω'], - [' ', ' '] + ['ω', 'ω'] ], graphical: [ ['↵', '↵'], @@ -316,7 +316,6 @@ HTMLArea.CharacterMap = HTMLArea.Plugin.extend({ [' ', ' '], [' ', ' '], [' ', ' '], - [' ', ' '], ['♣', '♣'], ['♦', '♦'], ['♥', '♥'], @@ -338,7 +337,7 @@ HTMLArea.CharacterMap = HTMLArea.Plugin.extend({ this.openDialogue( buttonId, 'Insert special character', - this.getWindowDimensions({width:462, height:330}, buttonId), + this.getWindowDimensions({width:434, height:360}, buttonId), this.buildTabItems() ); return false; diff --git a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css index d1be1a296cf..470d5f2db1b 100644 --- a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css +++ b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css @@ -308,11 +308,12 @@ body.ext-ie6 .htmlarea-window .x-panel-icon { .htmlarea-window .character-map .character { display: block; float: left; + height: 20px; width: 20px; font-size: 14px; font-weight: bold; text-align: center; - padding: 5px 3px; + padding: 3px; border: 1px solid transparent; } .htmlarea-window .character-map .character:hover { diff --git a/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css b/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css index 57fbe2e4d06..671bec97c08 100644 --- a/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css +++ b/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css @@ -313,11 +313,12 @@ body.ext-ie6 .htmlarea-window .x-panel-icon { .htmlarea-window .character-map .character { display: block; float: left; + height: 20px; width: 20px; font-size: 14px; font-weight: bold; text-align: center; - padding: 5px 3px; + padding: 3px; border: 1px solid transparent; } .htmlarea-window .character-map .character:hover { -- 2.20.1