Fixed bug #16148: htmlArea RTE: Missing cancel browser default after inserting charac...
authorStanislas Rolland <typo3@sjbr.ca>
Wed, 27 Oct 2010 17:56:42 +0000 (17:56 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Wed, 27 Oct 2010 17:56:42 +0000 (17:56 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-4@9212 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index f76047f..343356b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-27  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #16148: htmlArea RTE: Missing cancel browser default after inserting character or emoticon
+
 2010-10-27  Steffen Gebert  <steffen@steffen-gebert.de>
 
        * Fixed bug #15503: Improve t3lib_userAuth::getCookie() (Thanks to Michael B├╝rgi)
index 16cb288..708d167 100644 (file)
@@ -1,3 +1,7 @@
+2010-10-27  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #16148: htmlArea RTE: Missing cancel browser default after inserting character or emoticon
+
 2010-10-25  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #16087: htmlArea RTE: Missing soft hyphen entity in CharacterMap
index 4f583df..3423cda 100644 (file)
@@ -436,6 +436,7 @@ HTMLArea.CharacterMap = HTMLArea.Plugin.extend({
         * @return      void
         */
        insertCharacter: function (event, target) {
+               event.stopEvent();
                this.editor.focus();
                this.restoreSelection();
                var entity = Ext.get(target).dom.innerHTML;
@@ -446,6 +447,7 @@ HTMLArea.CharacterMap = HTMLArea.Plugin.extend({
                                // Firefox and WebKit convert '&nbsp;' to '&amp;nbsp;'
                        this.editor.insertNodeAtSelection(this.editor.document.createTextNode(((Ext.isGecko || Ext.isWebKit) && entity == '&nbsp;') ? '\xA0' : entity));
                }
+               return false;
        },
        /*
         * Reset focus on the the current selection, if at all possible
index 21d1aa4..acaf57b 100644 (file)
@@ -154,6 +154,7 @@ HTMLArea.InsertSmiley = HTMLArea.Plugin.extend({
         * @return      void
         */
        insertImageTag: function (event, target) {
+               event.stopEvent();
                this.editor.focus();
                this.restoreSelection();
                var icon = Ext.get(target).first();
@@ -166,5 +167,6 @@ HTMLArea.InsertSmiley = HTMLArea.Plugin.extend({
                        this.editor.selectNode(imgTag, false);
                }
                this.close();
+               return false;
        }
 });