paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-18 21:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Add an explicit user_search_section.

Browse Source 
This, among other things, makes it easier to
troubleshoot the resize code.
This commit is contained in:
Steve Howell
2019-02-10 18:58:59 +00:00
committed by Tim Abbott
parent a921e7e894
commit 5d8664d725
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/activity.js
View File

@@ -704,7 +704,7 @@ run_test('clear_search', () => {
activity.user_filter.clear_search(); activity.user_filter.clear_search();
assert.equal($('.user-list-filter').val(), ''); assert.equal($('.user-list-filter').val(), '');
activity.user_filter.clear_search(); activity.user_filter.clear_search();
assert($('#user-list .input-append').hasClass('notdisplayed')); assert($('#user_search_section').hasClass('notdisplayed'));
}); });
run_test('escape_search', () => { run_test('escape_search', () => {
@@ -713,7 +713,7 @@ run_test('escape_search', () => {
activity.escape_search(); activity.escape_search();
assert.equal($('.user-list-filter').val(), ''); assert.equal($('.user-list-filter').val(), '');
activity.escape_search(); activity.escape_search();
assert($('#user-list .input-append').hasClass('notdisplayed')); assert($('#user_search_section').hasClass('notdisplayed'));
}); });
reset_setup(); reset_setup();
@@ -733,13 +733,13 @@ run_test('initiate_search', () => {
run_test('toggle_filter_display', () => { run_test('toggle_filter_display', () => {
activity.user_filter.toggle_filter_displayed(); activity.user_filter.toggle_filter_displayed();
assert($('#user-list .input-append').hasClass('notdisplayed')); assert($('#user_search_section').hasClass('notdisplayed'));
$('.user-list-filter').closest = function (selector) { $('.user-list-filter').closest = function (selector) {
assert.equal(selector, ".app-main [class^='column-']"); assert.equal(selector, ".app-main [class^='column-']");
return $.create('sidebar').addClass('column-right'); return $.create('sidebar').addClass('column-right');
}; };
activity.user_filter.toggle_filter_displayed(); activity.user_filter.toggle_filter_displayed();
assert.equal($('#user-list .input-append').hasClass('notdisplayed'), false); assert.equal($('#user_search_section').hasClass('notdisplayed'), false);
}); });
run_test('searching', () => { run_test('searching', () => {

4
static/js/resize.js
View File

@@ -77,7 +77,7 @@ function get_new_heights() {
- parseInt(buddy_list_wrapper.css("marginTop"), 10) - parseInt(buddy_list_wrapper.css("marginTop"), 10)
- parseInt(buddy_list_wrapper.css("marginBottom"), 10) - parseInt(buddy_list_wrapper.css("marginBottom"), 10)
- $("#userlist-header").safeOuterHeight(true) - $("#userlist-header").safeOuterHeight(true)
- $(".user-list-filter").safeOuterHeight(true) - $("#user_search_section").safeOuterHeight(true)
- invite_user_link_height - invite_user_link_height
- parseInt(group_pms.css("marginTop"), 10) - parseInt(group_pms.css("marginTop"), 10)
- parseInt(group_pms.css("marginBottom"), 10) - parseInt(group_pms.css("marginBottom"), 10)
@@ -124,7 +124,7 @@ function left_userlist_get_new_heights() {
- $("#global_filters").safeOuterHeight(true) - $("#global_filters").safeOuterHeight(true)
- $("#streams_header").safeOuterHeight(true) - $("#streams_header").safeOuterHeight(true)
- $("#userlist-header").safeOuterHeight(true) - $("#userlist-header").safeOuterHeight(true)
- $(".user-list-filter").safeOuterHeight(true) - $("#user_search_section").safeOuterHeight(true)
- $("#group-pm-header").safeOuterHeight(true) - $("#group-pm-header").safeOuterHeight(true)
- parseInt(stream_filters.css("marginBottom"), 10) - parseInt(stream_filters.css("marginBottom"), 10)
- parseInt(buddy_list_wrapper.css("marginTop"), 10) - parseInt(buddy_list_wrapper.css("marginTop"), 10)

2
static/js/user_search.js
View File

@@ -5,7 +5,7 @@ var user_search = function (opts) {
var self = {}; var self = {};
var $widget = $('#user-list .input-append').expectOne(); var $widget = $('#user_search_section').expectOne();
var $input = $('.user-list-filter').expectOne(); var $input = $('.user-list-filter').expectOne();
self.input_field = function () { self.input_field = function () {

2
static/styles/media.scss
View File

@@ -90,7 +90,7 @@
padding: 0px; padding: 0px;
} }
.input-append .user-list-filter { #user_search_section .user-list-filter {
/* input should be 100% - 6px padding x2 - 1px border x2. */ /* input should be 100% - 6px padding x2 - 1px border x2. */
width: calc(100% - 12px - 2px); width: calc(100% - 12px - 2px);
} }

2
templates/zerver/app/right_sidebar.html
View File

@@ -12,7 +12,7 @@
<h4 class='sidebar-title' id='userlist-title' data-toggle="tooltip" title="{{ _('Filter users') }}">{{ _('USERS') }}</h4> <h4 class='sidebar-title' id='userlist-title' data-toggle="tooltip" title="{{ _('Filter users') }}">{{ _('USERS') }}</h4>
<i id="user_filter_icon" class='fa fa-search' aria-hidden="true" aria-label="{{ _('Filter users') }}" data-toggle="tooltip" title="{{ _('Filter users') }} (w)"></i> <i id="user_filter_icon" class='fa fa-search' aria-hidden="true" aria-label="{{ _('Filter users') }}" data-toggle="tooltip" title="{{ _('Filter users') }} (w)"></i>
</div> </div>
<div class="input-append notdisplayed"> <div class="input-append notdisplayed" id="user_search_section">
<input class="user-list-filter" type="text" autocomplete="off" placeholder="{{ _('Search people') }}" /> <input class="user-list-filter" type="text" autocomplete="off" placeholder="{{ _('Search people') }}" />
<button type="button" class="btn clear_search_button" id="clear_search_people_button"> <button type="button" class="btn clear_search_button" id="clear_search_people_button">
<i class="fa fa-remove" aria-hidden="true"></i> <i class="fa fa-remove" aria-hidden="true"></i>