sim1222/twemoji
1
0
Fork 0
mirror of https://github.com/twitter/twemoji.git synced 2025-08-04 07:06:42 +09:00
Code Issues Projects Releases Wiki Activity

Finish up attributes

Browse Source
This commit is contained in:
Derek Mooney
2015-04-11 09:49:52 -04:00
parent 1fa5a27fba
commit 5d4f6fabca
7 changed files with 154 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
twemoji.amd.js
View File

@ -255,7 +255,7 @@ define(function () {
* @param string text use in HTML attribute
* @return string text encoded to use in HTML attribute
*/
function escape(s) {
function escapeHTML(s) {
var escaped = {
'&': '&',
'<': '&lt;',
@ -267,7 +267,7 @@ define(function () {
return escaped[m];
});
}
/**
* Default callback used to generate emoji src
* based on Twitter CDN
@ -381,18 +381,21 @@ define(function () {
if (src) {
img = new Image();
img.onerror = twemoji.onerror;
img.className = options.className;
img.setAttribute('draggable', 'false');
if (options.attributes && typeof(options.attributes) === 'function') {
var attrib = options.attributes(alt);
if (attrib) {
for (var attrname in attrib) {
if (attrname.lastIndexOf('on', 0) === -1) {
var attrib = options.attributes(icon, variant);
if (attrib) {
for (var attrname in attrib) {
if (attrib.hasOwnProperty(attrname)) {
// don't allow any handlers to be set, don't allow overrides
if (attrname.indexOf('on') !== 0 && !img.hasAttribute(attrname)) {
img.setAttribute(attrname, attrib[attrname]);
}
}
}
}
img.className = options.className;
img.alt = alt;
img.src = src;
}
@ -432,6 +435,7 @@ define(function () {
function parseString(str, options) {
return replace(str, function (match, icon, variant) {
var src;
var ret = match;
// verify the variant is not the FE0E one
// this variant means "emoji as text" and should not
// require any action/replacement
@ -445,19 +449,7 @@ define(function () {
if (src) {
// recycle the match string replacing the emoji
// with its image counter part
var attr_text = '';
if (options.attributes && typeof(options.attributes) === 'function') {
var attrib = options.attributes(match);
if (attrib) {
for (var attrname in attrib) {
if (attrname.lastIndexOf('on', 0) === -1) {
attr_text = attr_text + ' ' + attrname + '="' + escape(attrib[attrname]) + '"';
}
}
}
}
match = '<img '.concat(
ret = '<img '.concat(
'class="', options.className, '" ',
'draggable="false" ',
// needs to preserve user original intent
@ -465,15 +457,26 @@ define(function () {
'alt="',
match,
'"',
attr_text,
' src="',
src,
'"',
'>'
'"'
);
var attrib = options.attributes(icon, variant);
if (attrib) {
for (var attrname in attrib) {
if (attrib.hasOwnProperty(attrname)) {
// don't allow any handlers to be set, don't allow overrides
if (attrname.indexOf('on') !== 0 && ret.indexOf(' ' + attrname + '=') === -1) {
ret = ret.concat(' ', attrname, '="', escapeHTML(attrib[attrname]), '"');
}
}
}
}
ret = ret.concat('>');
}
}
return match;
return ret;
});
}
@ -517,12 +520,12 @@ define(function () {
// if first argument is string, inject html <img> tags
// otherwise use the DOM tree and parse text nodes only
return (typeof what === 'string' ? parseString : parseNode)(what, {
callback: how.callback || defaultImageSrcGenerator,
attributes: how.attributes,
base: typeof how.base === 'string' ? how.base : twemoji.base,
ext: how.ext || twemoji.ext,
size: how.folder || toSizeSquaredAsset(how.size || twemoji.size),
className:how.className || twemoji.className
callback: how.callback || defaultImageSrcGenerator,
attributes: typeof how.attributes === 'function' ? how.attributes : function() {return {};},
base: typeof how.base === 'string' ? how.base : twemoji.base,
ext: how.ext || twemoji.ext,
size: how.folder || toSizeSquaredAsset(how.size || twemoji.size),
className: how.className || twemoji.className
});
}