Follow-up to bug #15797: htmlArea RTE: Problem in Firefox inserting non-breaking...
authorStanislas Rolland <typo3@sjbr.ca>
Mon, 27 Sep 2010 00:58:08 +0000 (00:58 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Mon, 27 Sep 2010 00:58:08 +0000 (00:58 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-4@8904 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/plugins/CharacterMap/character-map.js

index 38b806b..d3b4330 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-26  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Follow-up to bug #15797: htmlArea RTE: Problem in Firefox inserting non-breaking space with Insert Special Character dialogue
+
 2010-09-25  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #15430: htmlArea RTE: Text not editable after pasting with server-based cleaning
index e6d7693..63cf9d4 100644 (file)
@@ -1,3 +1,7 @@
+2010-09-26  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Follow-up to bug #15797: htmlArea RTE: Problem in Firefox inserting non-breaking space with Insert Special Character dialogue
+
 2010-09-25  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #15430: htmlArea RTE: Text not editable after pasting with server-based cleaning
index 6f0c64c..68ef296 100644 (file)
@@ -444,8 +444,8 @@ HTMLArea.CharacterMap = HTMLArea.Plugin.extend({
                        this.editor.insertHTML(entity);
                        this.saveSelection();
                } else {
-                               // Firefox converts '&nbsp;' to '&amp;nbsp;'
-                       this.editor.insertNodeAtSelection(this.editor.document.createTextNode((Ext.isGecko && entity == '&nbsp;') ? '\xA0' : entity));
+                               // Firefox and WebKit convert '&nbsp;' to '&amp;nbsp;'
+                       this.editor.insertNodeAtSelection(this.editor.document.createTextNode(((Ext.isGecko || Ext.isWebKit) && entity == '&nbsp;') ? '\xA0' : entity));
                }
        },
        /*