Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert lodash upgrade, it is causing severe breakages elsewhere

This commit is contained in:
Sam 2015-02-03 11:51:17 +11:00
parent 80d8b133d9
commit 5ddec2e76d
2 changed files with 4642 additions and 9761 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6
View File

@ -81,8 +81,18 @@ var trackEmojiUsage = function(title){
var initializeRecentlyUsedIcons = function(){ var initializeRecentlyUsedIcons = function(){
recentlyUsedIcons = []; recentlyUsedIcons = [];
var usage = JSON.parse(localStorage.emojiUsage); var usage = _.map(JSON.parse(localStorage.emojiUsage));
var recent = _.take(_.sortByAll(usage, ["usage", "title"]).reverse(), PER_ROW); usage.sort(function(a,b){
if(a.usage > b.usage){
return -1;
}
if(b.usage > a.usage){
return 1;
}
return a.title.localeCompare(b.title);
});
var recent = _.take(usage, PER_ROW);
if(recent.length > 0){ if(recent.length > 0){
_.each(recent, function(emoji){ _.each(recent, function(emoji){

14389
vendor/assets/javascripts/lodash.js vendored
View File

File diff suppressed because it is too large Load Diff