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

Most popular emojis instead of last ones

Browse Source 
Closes #484
This commit is contained in:
Igor Zhukov 2015-01-02 15:50:28 +01:00
parent 1cf3b56aea
commit 7a54610f53
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/vendor/jquery.emojiarea/jquery.emojiarea.js vendored
View File

@ -175,25 +175,36 @@
util.emojiInserted = function (emojiKey, menu, quickSelect) { util.emojiInserted = function (emojiKey, menu, quickSelect) {
ConfigStorage.get('emojis_recent', function (curEmojis) { ConfigStorage.get('emojis_recent', function (curEmojis) {
curEmojis = curEmojis || defaultRecentEmojis || []; curEmojis = curEmojis || defaultRecentEmojis || [];
if (curEmojis.length && typeof curEmojis[0] === 'string') {
var newCurEmojis = [];
for (var i = 0, l = curEmojis.length; i < l; i++) {
newCurEmojis.push([curEmojis[i], 1]);
}
curEmojis = newCurEmojis;
}
var pos = curEmojis.indexOf(emojiKey); var exists = false;
if (!pos) { for (var i = 0, l = curEmojis.length; i < l; i++) {
return false; if (curEmojis[i][0] == emojiKey) {
exists = true;
curEmojis[i][1]++;
break;
}
} }
if (pos != -1) { if (exists) {
curEmojis.splice(pos, 1); curEmojis.sort(function (a, b) {
} if (a[1] == b[1]) return 0;
curEmojis.unshift(emojiKey); return a[1] > b[1] ? -1 : 1;
if (curEmojis.length > 42) { });
curEmojis = curEmojis.slice(42); } else {
if (curEmojis.length > 41) {
curEmojis = curEmojis.slice(0, 41);
}
curEmojis.push([emojiKey, 1]);
} }
ConfigStorage.set({emojis_recent: curEmojis}); ConfigStorage.set({emojis_recent: curEmojis});
if (menu) {
menu.updateRecentTab(curEmojis);
}
if (quickSelect) { if (quickSelect) {
quickSelect.load(0); quickSelect.load(0);
} }
@ -635,7 +646,10 @@
curEmojis = curEmojis || defaultRecentEmojis || []; curEmojis = curEmojis || defaultRecentEmojis || [];
var key, i; var key, i;
for (i = 0; i < curEmojis.length; i++) { for (i = 0; i < curEmojis.length; i++) {
key = curEmojis[i] key = curEmojis[i];
if (Array.isArray(key)) {
key = key[0];
}
if (options[key]) { if (options[key]) {
html.push('<a href="javascript:void(0)" title="' + util.htmlEntities(key) + '">' + EmojiArea.createIcon(options[key], true) + '<span class="label">' + util.htmlEntities(key) + '</span></a>'); html.push('<a href="javascript:void(0)" title="' + util.htmlEntities(key) + '">' + EmojiArea.createIcon(options[key], true) + '<span class="label">' + util.htmlEntities(key) + '</span></a>');
} }