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

lint: Require folding of } on same line in else if statements.

Browse Source
This commit is contained in:
Tim Abbott
2016-06-09 14:05:34 -07:00
parent c35781d505
commit 584887e588
7 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/avatar.js
View File

@@ -107,8 +107,7 @@ exports.build_widget = function (
input_error.text('File size must be < 5Mb.'); input_error.text('File size must be < 5Mb.');
input_error.show(); input_error.show();
clear(); clear();
} } else if (!is_image_format(file)) {
else if (!is_image_format(file)) {
input_error.text('File type is not supported.'); input_error.text('File type is not supported.');
input_error.show(); input_error.show();
clear(); clear();
@@ -193,8 +192,7 @@ exports.build_direct_upload_widget = function (
input_error.text('File size must be < 5Mb.'); input_error.text('File size must be < 5Mb.');
input_error.show(); input_error.show();
clear(); clear();
} } else if (!is_image_format(file)) {
else if (!is_image_format(file)) {
input_error.text('File type is not supported.'); input_error.text('File type is not supported.');
input_error.show(); input_error.show();
clear(); clear();

3
static/js/filter.js
View File

@@ -62,8 +62,7 @@ function message_matches_search_term(message, operator, operand) {
case 'in': case 'in':
if (operand === 'home') { if (operand === 'home') {
return message_in_home(message); return message_in_home(message);
} } else if (operand === 'all') {
else if (operand === 'all') {
return true; return true;
} }
return true; // in:whatever returns true return true; // in:whatever returns true

6
static/js/popovers.js
View File

@@ -117,11 +117,9 @@ exports.actions_menu_handle_keyboard = function (key) {
} }
if (index === -1) { if (index === -1) {
index = 0; index = 0;
} } else if ((key === 'down_arrow' || key === 'vim_down') && index < items.length - 1) {
else if ((key === 'down_arrow' || key === 'vim_down') && index < items.length - 1) {
++index; ++index;
} } else if ((key === 'up_arrow' || key === 'vim_up') && index > 0) {
else if ((key === 'up_arrow' || key === 'vim_up') && index > 0) {
--index; --index;
} }
items.eq(index).focus(); items.eq(index).focus();

3
static/js/resize.js
View File

@@ -212,8 +212,7 @@ exports.resize_page_components = function () {
$("#group-pms").css("margin", "0px"); $("#group-pms").css("margin", "0px");
$("#userlist-toggle").css("display", "none"); $("#userlist-toggle").css("display", "none");
$("#invite-user-link").hide(); $("#invite-user-link").hide();
} } else if (!css_narrow_mode && narrow_window) {
else if (!css_narrow_mode && narrow_window) {
// move stuff to the right sidebar (wide mode) // move stuff to the right sidebar (wide mode)
narrow_window = false; narrow_window = false;
popovers.set_userlist_placement("right"); popovers.set_userlist_placement("right");

12
static/js/stream_list.js
View File

@@ -212,11 +212,9 @@ function update_count_in_dom(count_span, value_span, count) {
count_span.hide(); count_span.hide();
if (count_span.parent().hasClass("subscription_block")) { if (count_span.parent().hasClass("subscription_block")) {
count_span.parent(".subscription_block").removeClass("stream-with-count"); count_span.parent(".subscription_block").removeClass("stream-with-count");
} } else if (count_span.parent().hasClass("user_sidebar_entry")) {
else if (count_span.parent().hasClass("user_sidebar_entry")) {
count_span.parent(".user_sidebar_entry").removeClass("user-with-count"); count_span.parent(".user_sidebar_entry").removeClass("user-with-count");
} } else if (count_span.parent().hasClass("group-pms-sidebar-entry")) {
else if (count_span.parent().hasClass("group-pms-sidebar-entry")) {
count_span.parent(".group-pms-sidebar-entry").removeClass("group-with-count"); count_span.parent(".group-pms-sidebar-entry").removeClass("group-with-count");
} }
value_span.text(''); value_span.text('');
@@ -227,11 +225,9 @@ function update_count_in_dom(count_span, value_span, count) {
if (count_span.parent().hasClass("subscription_block")) { if (count_span.parent().hasClass("subscription_block")) {
count_span.parent(".subscription_block").addClass("stream-with-count"); count_span.parent(".subscription_block").addClass("stream-with-count");
} } else if (count_span.parent().hasClass("user_sidebar_entry")) {
else if (count_span.parent().hasClass("user_sidebar_entry")) {
count_span.parent(".user_sidebar_entry").addClass("user-with-count"); count_span.parent(".user_sidebar_entry").addClass("user-with-count");
} } else if (count_span.parent().hasClass("group-pms-sidebar-entry")) {
else if (count_span.parent().hasClass("group-pms-sidebar-entry")) {
count_span.parent(".group-pms-sidebar-entry").addClass("group-with-count"); count_span.parent(".group-pms-sidebar-entry").addClass("group-with-count");
} }
value_span.text(count); value_span.text(count);

3
static/js/subs.js
View File

@@ -25,8 +25,7 @@ function selectText(element) {
sel.removeAllRanges(); sel.removeAllRanges();
sel.addRange(range); sel.addRange(range);
} } else if (document.body.createTextRange) {
else if (document.body.createTextRange) {
range = document.body.createTextRange(); range = document.body.createTextRange();
range.moveToElementText(element); range.moveToElementText(element);
range.select(); range.select();

2
tools/lint-all
View File

@@ -153,6 +153,8 @@ js_rules = [
'description': 'Missing space between else and {'}, 'description': 'Missing space between else and {'},
{'pattern': '^else {$', {'pattern': '^else {$',
'description': 'Write JS else statements on same line as }'}, 'description': 'Write JS else statements on same line as }'},
{'pattern': '^else if',
'description': 'Write JS else statements on same line as }'},
] + whitespace_rules ] + whitespace_rules
python_rules = [ python_rules = [
{'pattern': '^(?!#)@login_required', {'pattern': '^(?!#)@login_required',