Skip to content

Commit

Permalink
Merge 2db0dac into 76b515d
Browse files Browse the repository at this point in the history
  • Loading branch information
@iamcal
iamcal committed Jan 7, 2020
2 parents 76b515d + 2db0dac commit f1d5a4f
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions build/emoji.js.template
View file
Expand Up @@ -407,10 +407,10 @@
// output
if (self.supports_css) {
if (self.use_sheet && img.px != null && img.py != null){
var sheet_size = self.sheet_size * (img.sheet_size+2); // size of image in pixels
var sheet_x = 100 * (((img.px * (img.sheet_size+2)) + 1) / (sheet_size - img.sheet_size));
var sheet_y = 100 * (((img.py * (img.sheet_size+2)) + 1) / (sheet_size - img.sheet_size));
var sheet_sz = 100 * (sheet_size / img.sheet_size);
// simplified calculation of `100 * (position * sprite_size) / ( (sheet_size * sprite_size) - sprite_size )`
var sheet_x = 100 * img.px / (self.sheet_size - 1);
var sheet_y = 100 * img.py / (self.sheet_size - 1);
var sheet_sz = 100 * self.sheet_size;

var style = 'background: url('+img.sheet+');background-position:'+(sheet_x)+'% '+(sheet_y)+'%;background-size:'+sheet_sz+'% '+sheet_sz+'%';
return '<span class="emoji-outer emoji-sizer"><span class="emoji-inner" style="'+style+'"'+title+' data-codepoints="'+img.full_idx+'">'+text+'</span></span>'+extra;
Expand Down
8 changes: 4 additions & 4 deletions lib/emoji.js
View file
Expand Up @@ -411,10 +411,10 @@
// output
if (self.supports_css) {
if (self.use_sheet && img.px != null && img.py != null){
var sheet_size = self.sheet_size * (img.sheet_size+2); // size of image in pixels
var sheet_x = 100 * (((img.px * (img.sheet_size+2)) + 1) / (sheet_size - img.sheet_size));
var sheet_y = 100 * (((img.py * (img.sheet_size+2)) + 1) / (sheet_size - img.sheet_size));
var sheet_sz = 100 * (sheet_size / img.sheet_size);
// simplified calculation of `100 * (position * sprite_size) / ( (sheet_size * sprite_size) - sprite_size )`
var sheet_x = 100 * img.px / (self.sheet_size - 1);
var sheet_y = 100 * img.py / (self.sheet_size - 1);
var sheet_sz = 100 * self.sheet_size;

var style = 'background: url('+img.sheet+');background-position:'+(sheet_x)+'% '+(sheet_y)+'%;background-size:'+sheet_sz+'% '+sheet_sz+'%';
return '<span class="emoji-outer emoji-sizer"><span class="emoji-inner" style="'+style+'"'+title+' data-codepoints="'+img.full_idx+'">'+text+'</span></span>'+extra;
Expand Down
14 changes: 7 additions & 7 deletions lib/emoji.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/fallbacks.spec.js
View file
Expand Up @@ -44,9 +44,9 @@ describe("Fallbacks", function(){

emoji.use_sheet = true;

var obs_turban_pos = '41.181710213776725% 86.25296912114014%';
var man_turban_pos = '41.181710213776725% 74.49524940617577%';
var woman_turban_pos = '41.181710213776725% 62.7375296912114%';
var obs_turban_pos = '41.1764705882353% 86.27450980392157%';
var man_turban_pos = '41.1764705882353% 74.50980392156863%';
var woman_turban_pos = '41.1764705882353% 62.745098039215684%';

// only apple, google and twitter have the gendered versions
emoji.img_set = 'apple';
Expand Down
2 changes: 1 addition & 1 deletion test/modes.spec.js
View file
Expand Up @@ -20,7 +20,7 @@ describe("Correctly supports different modes", function(){
emoji.use_sheet = true;
emoji.use_css_imgs = false;

expect(emoji.replace_colons(':cloud:')).toBe(emoji_sheet_cp_path('2601-fe0f', '/sheet.png', '92.13182897862234% 33.343230403800476%'));
expect(emoji.replace_colons(':cloud:')).toBe(emoji_sheet_cp_path('2601-fe0f', '/sheet.png', '92.15686274509804% 33.333333333333336%'));
});

it("Uses CSS classes with CSS background-sizing support", function(){
Expand Down
4 changes: 2 additions & 2 deletions test/obsoletes.spec.js
View file
Expand Up @@ -15,8 +15,8 @@ describe("Obsoletes", function(){
emoji.allow_native = false;
emoji.avoid_ms_emoji = true;

var ok_woman_pos = '62.7375296912114% 19.62589073634204%';
var ok_man_pos = '62.7375296912114% 31.383610451306414%';
var ok_woman_pos = '62.745098039215684% 19.607843137254903%';
var ok_man_pos = '62.745098039215684% 31.372549019607842%';

it("converts unified to the new form", function(){

Expand Down
2 changes: 1 addition & 1 deletion test/preamble.js
View file
Expand Up @@ -24,6 +24,6 @@ function emoji_image_cp_path(cp, path, img_cp){
}

function emoji_sheet_cp_path(cp, path, b_pos){
var bg_size = '5362.5%';
var bg_size = '5200%';
return '<span class="emoji-outer emoji-sizer"><span class="emoji-inner" style="background: url('+path+');background-position:'+b_pos+';background-size:'+bg_size+' '+bg_size+'" data-codepoints="'+cp+'"></span></span>';
}

0 comments on commit f1d5a4f

Please sign in to comment.