paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

node_modules: Add npm packages for the supported emojisets.

Browse Source 
This commit adds emoji datasource packages for the rest of the emojiset
packages which we will use for serving images in notifications.
This commit is contained in:
Harshit Bansal
2017-10-27 19:44:12 +00:00
committed by Tim Abbott
parent d132c30c24
commit 1067cfd92a
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -9,7 +9,10 @@
"@types/webpack": "3.0.13",
"clipboard": "1.5.16",
"emoji-datasource": "3.0.0",
"emoji-datasource-apple": "3.0.0",
"emoji-datasource-emojione": "3.0.0",
"emoji-datasource-google": "3.0.0",
"emoji-datasource-twitter": "3.0.0",
"expose-loader": "0.7.3",
"fuzzysearch": "1.0.3",
"handlebars": "4.0.10",

9
tools/setup/emoji/build_emoji
View File

@@ -116,9 +116,11 @@ def generate_sprite_css_files(cache_path, emoji_map, emoji_data):
def setup_emoji_farm(cache_path, emoji_map, emoji_data):
# type: (Text, Dict[Text, Text], List[Dict[Text, Any]]) -> None
# Copy individual emoji images from npm package.
src_emoji_farm = os.path.join(NODE_MODULES_PATH, 'emoji-datasource-google', 'img', 'google', '64', '*')
target_emoji_farm = os.path.join(cache_path, 'images-google-64')
for emojiset in EMOJISETS:
# Copy individual emoji images from npm packages.
src_emoji_farm = os.path.join(
NODE_MODULES_PATH, 'emoji-datasource-' + emojiset, 'img', emojiset, '64', '*')
target_emoji_farm = os.path.join(cache_path, 'images-' + emojiset + '-64')
run(['mkdir', '-p', target_emoji_farm])
run(['cp', '-RPp', src_emoji_farm, target_emoji_farm], shell=True)
@@ -127,7 +129,6 @@ def setup_emoji_farm(cache_path, emoji_map, emoji_data):
run(['cp', '-RPp', zulip_image, target_emoji_farm], shell=True)
# Copy spritesheets.
for emojiset in EMOJISETS:
input_sprite_sheet = os.path.join(EMOJI_DATA_PATH, 'img', emojiset, 'sheets', '32.png')
output_sprite_sheet = os.path.join(cache_path, 'sheet_%s_32.png' % (emojiset,))
run(['cp', input_sprite_sheet, output_sprite_sheet])

2
version.py
View File

@@ -1,2 +1,2 @@
ZULIP_VERSION = "1.7.0+git"
PROVISION_VERSION = '11.0'
PROVISION_VERSION = '11.1'