updated JS to correctly map the new image sets

iamcal · May 6, 2017 · 44c24ff · 44c24ff
1 parent f3c7e2c
commit 44c24ff
Show file tree

Hide file tree

Showing 4 changed files with 1,533 additions and 1,527 deletions.
diff --git a/build/build.php b/build/build.php
@@ -150,5 +150,7 @@ function calc_img_has($row){
 		if ($row['has_img_google']) $has_imgs_bits |= 2;
 		if ($row['has_img_twitter']) $has_imgs_bits |= 4;
 		if ($row['has_img_emojione']) $has_imgs_bits |= 8;
+		if ($row['has_img_facebook']) $has_imgs_bits |= 16;
+		if ($row['has_img_messenger']) $has_imgs_bits |= 32;
 		return $has_imgs_bits;
 	}
diff --git a/build/emoji.js.template b/build/emoji.js.template
@@ -33,10 +33,12 @@
 		 * @type {object}
 		 */
 		self.img_sets = {
-			'apple'    : {'path' : '/emoji-data/img-apple-64/'   , 'sheet' : '/emoji-data/sheet_apple_64.png',    'mask' : 1 },
-			'google'   : {'path' : '/emoji-data/img-google-64/'  , 'sheet' : '/emoji-data/sheet_google_64.png',   'mask' : 2 },
-			'twitter'  : {'path' : '/emoji-data/img-twitter-64/' , 'sheet' : '/emoji-data/sheet_twitter_64.png',  'mask' : 4 },
-			'emojione' : {'path' : '/emoji-data/img-emojione-64/', 'sheet' : '/emoji-data/sheet_emojione_64.png', 'mask' : 8 }
+			'apple'     : {'path' : '/emoji-data/img-apple-64/'    , 'sheet' : '/emoji-data/sheet_apple_64.png',     'mask' : 1  },
+			'google'    : {'path' : '/emoji-data/img-google-64/'   , 'sheet' : '/emoji-data/sheet_google_64.png',    'mask' : 2  },
+			'twitter'   : {'path' : '/emoji-data/img-twitter-64/'  , 'sheet' : '/emoji-data/sheet_twitter_64.png',   'mask' : 4  },
+			'emojione'  : {'path' : '/emoji-data/img-emojione-64/' , 'sheet' : '/emoji-data/sheet_emojione_64.png',  'mask' : 8  },
+			'facebook'  : {'path' : '/emoji-data/img-facebook-64/' , 'sheet' : '/emoji-data/sheet_facebook_64.png',  'mask' : 16 },
+			'messenger' : {'path' : '/emoji-data/img-messenger-64/', 'sheet' : '/emoji-data/sheet_messenger_64.png', 'mask' : 32 }
 		};
 
 		/**