r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed multiple emoji highlight

Browse Source
This commit is contained in:
Igor Zhukov 2014-03-05 15:03:01 +01:00
parent 2c67151833
commit 5f2df3eb9f
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/css/app.css
View File

@ -1697,9 +1697,9 @@ img.img_fullsize {
.emoji-menu { .emoji-menu {
position: absolute; position: absolute;
z-index: 999; z-index: 999;
width: 206px; width: 220px;
margin-left: -100px; margin-left: -107px;
margin-top: -233px; margin-top: -245px;
overflow: hidden; overflow: hidden;
border: 1px #dfdfdf solid; border: 1px #dfdfdf solid;
@ -1735,21 +1735,12 @@ img.img_fullsize {
.emoji-menu-tabs .icon-smile {background-position: -9px -34px; } .emoji-menu-tabs .icon-smile {background-position: -9px -34px; }
.emoji-menu-tabs .icon-smile-selected {background-position: -9px -5px; } .emoji-menu-tabs .icon-smile-selected {background-position: -9px -5px; }
.is_2x .emoji-menu-tabs .icon-smile {background-position: -9px -37px; }
.is_2x .emoji-menu-tabs .icon-smile-selected {background-position: -9px -8px; }
.emoji-menu-tabs .icon-flower {background-position: -9px -145px; } .emoji-menu-tabs .icon-flower {background-position: -9px -145px; }
.emoji-menu-tabs .icon-flower-selected {background-position: -9px -118px; } .emoji-menu-tabs .icon-flower-selected {background-position: -9px -118px; }
.is_2x .emoji-menu-tabs .icon-flower {background-position: -9px -145px; }
.is_2x .emoji-menu-tabs .icon-flower-selected {background-position: -9px -119px; }
.emoji-menu-tabs .icon-bell {background-position: -9px -90px; } .emoji-menu-tabs .icon-bell {background-position: -9px -90px; }
.emoji-menu-tabs .icon-bell-selected {background-position: -9px -62px; } .emoji-menu-tabs .icon-bell-selected {background-position: -9px -62px; }
.is_2x .emoji-menu-tabs .icon-bell {background-position: -9px -91px; }
.is_2x .emoji-menu-tabs .icon-bell-selected {background-position: -9px -64px; }
.emoji-menu-tabs .icon-car {background-position: -9px -196px; } .emoji-menu-tabs .icon-car {background-position: -9px -196px; }
.emoji-menu-tabs .icon-car-selected {background-position: -9px -170px; } .emoji-menu-tabs .icon-car-selected {background-position: -9px -170px; }
@ -1774,7 +1765,7 @@ img.img_fullsize {
.emoji-menu .emoji-items-wrap { .emoji-menu .emoji-items-wrap {
position: relative; position: relative;
height: 162px; height: 174px;
} }
.emoji-menu .emoji-items { .emoji-menu .emoji-items {
padding-right: 8px; padding-right: 8px;
@ -1788,8 +1779,7 @@ img.img_fullsize {
} }
.emoji-menu .emoji-items a { .emoji-menu .emoji-items a {
margin: -1px 0 0 -1px; margin: -1px 0 0 -1px;
/*border: 1px solid #f2f2f2;*/ padding: 5px;
padding: 4px;
display: block; display: block;
float: left; float: left;
border-radius: 2px; border-radius: 2px;

BIN
app/img/icons/IconsetSmiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

24
app/js/services.js
View File

@ -2290,8 +2290,9 @@ angular.module('myApp.services', [])
raw = text, raw = text,
html = [], html = [],
url, url,
emojiStyle = '', emojiFound = false,
emojiFound = false; emojiTitle,
emojiCoords;
while ((match = raw.match(regExp))) { while ((match = raw.match(regExp))) {
// console.log(2, match); // console.log(2, match);
@ -2331,13 +2332,16 @@ angular.module('myApp.services', [])
if (emojiCode = emojiMap[match[6]]) { if (emojiCode = emojiMap[match[6]]) {
emojiFound = true; emojiFound = true;
var emojiTitle = encodeEntities(emojiData[emojiCode][1][0]); emojiTitle = encodeEntities(emojiData[emojiCode][1][0]);
var emojiCoords = getEmojiSpritesheetCoords(emojiCode); emojiCoords = getEmojiSpritesheetCoords(emojiCode);
var xoffset = -(emojiIconSize * emojiCoords.column);
var yoffset = -(emojiIconSize * emojiCoords.row);
emojiStyle = 'background-position:' + xoffset + 'px ' + yoffset + 'px;';
html.push( html.push(
'<span class="emoji emoji-spritesheet-'+emojiCoords.category+'" ', '<span class="emoji emoji-',
emojiCoords.category,
'-',
(emojiIconSize * emojiCoords.column),
'-',
(emojiIconSize * emojiCoords.row),
'" ',
'title="',emojiTitle, '">', 'title="',emojiTitle, '">',
':', emojiTitle, ':</span>' ':', emojiTitle, ':</span>'
); );
@ -2355,8 +2359,8 @@ angular.module('myApp.services', [])
// console.log(3, text, html); // console.log(3, text, html);
if (emojiFound) { if (emojiFound) {
text = text.replace(/<span class="emoji emoji-spritesheet-([0-9]+?)"(.+?)<\/span>/g, text = text.replace(/<span class="emoji emoji-(\d)-(\d+)-(\d+)"(.+?)<\/span>/g,
'<span class="emoji emoji-spritesheet-$1" style="'+emojiStyle+'" $2</span>'); '<span class="emoji emoji-spritesheet-$1" style="background-position: -$2px -$3px;" $4</span>');
} }
// console.log(4, text, html); // console.log(4, text, html);