github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: In Firefox :w autocomplete was broken

Browse Source 
Always use hasOwnProperty as opposed to [] on hash objects,
{} has a "watch" function in Firefox
This commit is contained in:
Sam 2014-12-09 12:11:56 +11:00
parent ef5d56a258
commit 8b9c7da571
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/emoji/assets/javascripts/emoji.js.erb
View File

@ -46,23 +46,29 @@ var search = function(term, options) {
Discourse.Emoji.search = search; Discourse.Emoji.search = search;
var urlFor = function(code) {
var url = _extendedEmoji[code];
if (!url && emoji.indexOf(code) !== -1) {
url = Discourse.getURL('/plugins/emoji/images/' + code + '.png');
}
return url;
}
Discourse.Emoji.urlFor = urlFor;
var emojiHash = {}; var emojiHash = {};
emoji.forEach(function(code){ emoji.forEach(function(code){
emojiHash[code] = true; emojiHash[code] = true;
}); });
var urlFor = function(code) {
var url;
if(_extendedEmoji.hasOwnProperty(code)) {
url = _extendedEmoji[code];
}
if (!url && emojiHash.hasOwnProperty(code)) {
url = Discourse.getURL('/plugins/emoji/images/' + code + '.png');
}
return url;
}
Discourse.Emoji.urlFor = urlFor;
Discourse.Emoji.exists = function(code){ Discourse.Emoji.exists = function(code){
return !!(_extendedEmoji[code] || emojiHash[code]); return !!(_extendedEmoji.hasOwnProperty(code) || emojiHash.hasOwnProperty(code));
} }
function imageFor(code) { function imageFor(code) {