paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 08:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose_control_buttons: Rename giphy_api_available to giphy_enabled.

Browse Source
This commit is contained in:
Aman Agrawal
2021-04-15 14:18:36 +00:00
committed by Tim Abbott
parent 1a525be3a3
commit 4f3cae7d65
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/compose.js
View File

@@ -1066,7 +1066,7 @@ test_ui("initialize", (override) => {
assert.equal(template_name, "compose"); assert.equal(template_name, "compose");
assert.equal(context.embedded, false); assert.equal(context.embedded, false);
assert.equal(context.file_upload_enabled, true); assert.equal(context.file_upload_enabled, true);
assert.equal(context.giphy_api_available, true); assert.equal(context.giphy_enabled, true);
return "fake-compose-template"; return "fake-compose-template";
}); });

2
static/js/compose.js
View File

@@ -1105,7 +1105,7 @@ export function initialize() {
render_compose({ render_compose({
embedded: $compose.attr("data-embedded") === "", embedded: $compose.attr("data-embedded") === "",
file_upload_enabled: page_params.max_file_upload_size_mib > 0, file_upload_enabled: page_params.max_file_upload_size_mib > 0,
giphy_api_available: page_params.giphy_api_key !== "", giphy_enabled: page_params.giphy_api_key !== "",
}), }),
); );

2
static/js/message_edit.js
View File

@@ -355,7 +355,7 @@ function edit_message(row, raw_content) {
stream_name: message.stream, stream_name: message.stream,
notify_new_thread: notify_new_thread_default, notify_new_thread: notify_new_thread_default,
notify_old_thread: notify_old_thread_default, notify_old_thread: notify_old_thread_default,
giphy_api_available: page_params.giphy_api_key !== "", giphy_enabled: page_params.giphy_api_key !== "",
}), }),
); );

2
static/templates/compose_control_buttons.hbs
View File

@@ -7,7 +7,7 @@
<a role="button" class="undo_markdown_preview compose_control_button fa fa-edit" aria-label="{{t 'Write' }}" tabindex=0 style="display:none;" title="{{t 'Write' }}"></a> <a role="button" class="undo_markdown_preview compose_control_button fa fa-edit" aria-label="{{t 'Write' }}" tabindex=0 style="display:none;" title="{{t 'Write' }}"></a>
<a role="button" class="compose_control_button fa fa-video-camera video_link" aria-label="{{t 'Add video call' }}" tabindex=0 title="{{t 'Add video call' }}"></a> <a role="button" class="compose_control_button fa fa-video-camera video_link" aria-label="{{t 'Add video call' }}" tabindex=0 title="{{t 'Add video call' }}"></a>
<a role="button" class="compose_control_button fa fa-smile-o emoji_map" aria-label="{{t 'Add emoji' }}" tabindex=0 title="{{t 'Add emoji' }}"></a> <a role="button" class="compose_control_button fa fa-smile-o emoji_map" aria-label="{{t 'Add emoji' }}" tabindex=0 title="{{t 'Add emoji' }}"></a>
{{#if giphy_api_available }} {{#if giphy_enabled }}
<a role="button" class="compose_control_button" aria-label="{{t 'Add GIF' }}" id="compose_box_giphy_grid" title="{{t 'Add GIF' }}"> <a role="button" class="compose_control_button" aria-label="{{t 'Add GIF' }}" id="compose_box_giphy_grid" title="{{t 'Add GIF' }}">
<img class="compose_giphy_logo" tabindex=0 src="/static/images/GIPHY_logo.png" /> <img class="compose_giphy_logo" tabindex=0 src="/static/images/GIPHY_logo.png" />
</a> </a>