Added feature #16293: htmlArea RTE: Add quick tips to insert emoticon dialogue
authorStanislas Rolland <typo3@sjbr.ca>
Sun, 7 Nov 2010 16:50:09 +0000 (16:50 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sun, 7 Nov 2010 16:50:09 +0000 (16:50 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9301 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index 0e21e24..b540fd9 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-07  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Added feature #16293: htmlArea RTE: Add quick tips to insert emoticon dialogue
+
 2010-11-06  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #16281: htmlArea RTE: Add context sensitive help to remove format dialogue (BE only)
index 3a98458..e8f87e8 100644 (file)
@@ -1,3 +1,7 @@
+2010-11-07  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Added feature #16293: htmlArea RTE: Add quick tips to insert emoticon dialogue
+
 2010-11-06  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #16281: htmlArea RTE: Add context sensitive help to remove format dialogue (BE only)
index acaf57b..765b1ef 100644 (file)
@@ -121,7 +121,7 @@ HTMLArea.InsertSmiley = HTMLArea.Plugin.extend({
                                xtype: 'box',
                                cls: 'emoticon-array',
                                tpl: new Ext.XTemplate(
-                                       '<tpl for="."><a href="#" class="emoticon" hidefocus="on"><img alt="{alt}" title="{title}" src="{file}" /></a></tpl>'
+                                       '<tpl for="."><a href="#" class="emoticon" hidefocus="on" ext:qtitle="{alt}" ext:qtip="{title}"><img src="{file}" /></a></tpl>'
                                ),
                                listeners: {
                                        render: {
@@ -160,8 +160,8 @@ HTMLArea.InsertSmiley = HTMLArea.Plugin.extend({
                var icon = Ext.get(target).first();
                var imgTag = this.editor.document.createElement('img');
                imgTag.setAttribute('src', icon.getAttribute('src'));
-               imgTag.setAttribute('alt', icon.getAttribute('alt'));
-               imgTag.setAttribute('title', icon.getAttribute('title'));
+               imgTag.setAttribute('alt', target.getAttribute('ext:qtitle'));
+               imgTag.setAttribute('title', target.getAttribute('ext:qtip'));
                this.editor.insertNodeAtSelection(imgTag);
                if (!Ext.isIE) {
                        this.editor.selectNode(imgTag, false);