mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

wysiwyg emoticon fix

Browse Source
This commit is contained in:
Cameron
2013-03-18 22:38:13 -07:00
parent fa3a2fa842
commit e86f651a65
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
e107_plugins/tinymce/plugins/e107bbcode/img/bbcode.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

8
e107_plugins/tinymce/plugins/emoticons/emoticons.php
View File

@@ -21,7 +21,7 @@ e107::js('inline',"
$(document).ready(function() $(document).ready(function()
{ {
$('.selectEmote').click(function () { $('.selectEmote').click(function () {
var file_name = $(this).attr('src'); var file_name = $(this).attr('data-src');
var html = '<img src=\"' + file_name + '\" alt=\"\" />'; var html = '<img src=\"' + file_name + '\" alt=\"\" />';
tinyMCEPopup.editor.execCommand('mceInsertContent', false, html); tinyMCEPopup.editor.execCommand('mceInsertContent', false, html);
tinyMCEPopup.close(); tinyMCEPopup.close();
@@ -41,7 +41,7 @@ $(document).ready(function()
e107::lan('core','admin',TRUE); e107::lan('core','admin',TRUE);
require_once(HEADERF); require_once(e_ADMIN."auth.php");
$emotes = $sysprefs->getArray("emote_".$pref['emotepack']); $emotes = $sysprefs->getArray("emote_".$pref['emotepack']);
@@ -53,7 +53,7 @@ require_once(HEADERF);
$key = preg_replace("#_(\w{3})$#", ".\\1", $key); $key = preg_replace("#_(\w{3})$#", ".\\1", $key);
$value2 = substr($value, 0, strpos($value, " ")); $value2 = substr($value, 0, strpos($value, " "));
$value = ($value2 ? $value2 : $value); $value = ($value2 ? $value2 : $value);
$str .= "\n<button class='btn btn-large selectEmote pull-left'> $str .= "\n<button data-src=\"".e_IMAGE_ABS."emotes/" . $pref['emotepack'] . "/$key\" class='btn btn-large selectEmote pull-left'>
<img src=\"".e_IMAGE_ABS."emotes/" . $pref['emotepack'] . "/$key\" style=\"min-width:32px; min-height:32px; border:0px\" alt=\"\" /> <img src=\"".e_IMAGE_ABS."emotes/" . $pref['emotepack'] . "/$key\" style=\"min-width:32px; min-height:32px; border:0px\" alt=\"\" />
</button>"; </button>";
@@ -68,7 +68,7 @@ $ns->tablerender("Emoticons",$str);
require_once(FOOTERF); require_once(e_ADMIN."footer.php");
exit; exit;