From 827b4b5bbe9613104fd9390db0756ab2611a1595 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Fri, 18 Sep 2020 14:15:41 +0200 Subject: [PATCH 1/3] :art: Fix string delimiter Thanks @jbostoen for pointing this out (see discussion in 0773660ef26164a8ab24a151817bb148fe368f08) --- js/table-selectable-lines.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/js/table-selectable-lines.js b/js/table-selectable-lines.js index 5a2d0bae21..b4b583d8e9 100644 --- a/js/table-selectable-lines.js +++ b/js/table-selectable-lines.js @@ -95,19 +95,24 @@ $(document).ready(function () { * @returns {boolean} true if our custom handler shouldn't be run */ function shouldExitHandler($eventTarget) { - if ($eventTarget.is("table")) { // might happen on cell padding/margin/border + if ($eventTarget.is("table")) + { // might happen on cell padding/margin/border return true; } - if ($eventTarget.is("a, button")) { + if ($eventTarget.is("a, button")) + { return true; } - if ($eventTarget.parent().is('a, button')) { + if ($eventTarget.parent().is("a, button")) + { return true; } - if ($eventTarget.is("input, select, option")) { + if ($eventTarget.is("input, select, option")) + { return true; } - if ($eventTarget.is("img")) { // too hard to determine if an event handler is attached so excluding all ! + if ($eventTarget.is("img")) + { // too hard to determine if an event handler is attached so excluding all ! return true; } From 57fea037458771cd4527c674db077c755579efeb Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Fri, 18 Sep 2020 14:21:47 +0200 Subject: [PATCH 2/3] :wrench: Fix editorconfig for JS files --- .editorconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index f209490bf8..d095a35cf2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -132,7 +132,7 @@ ij_javascript_blank_lines_around_class = 1 ij_javascript_blank_lines_around_field = 0 ij_javascript_blank_lines_around_function = 1 ij_javascript_blank_lines_around_method = 1 -ij_javascript_block_brace_style = next_line +ij_javascript_block_brace_style = end_of_line ij_javascript_call_parameters_new_line_after_left_paren = false ij_javascript_call_parameters_right_paren_on_new_line = false ij_javascript_call_parameters_wrap = off @@ -140,7 +140,7 @@ ij_javascript_catch_on_new_line = false ij_javascript_chained_call_dot_on_new_line = true ij_javascript_class_brace_style = end_of_line ij_javascript_comma_on_new_line = false -ij_javascript_do_while_brace_force = never +ij_javascript_do_while_brace_force = always ij_javascript_else_on_new_line = true ij_javascript_enforce_trailing_comma = keep ij_javascript_extends_keyword_wrap = off @@ -148,7 +148,7 @@ ij_javascript_extends_list_wrap = off ij_javascript_field_prefix = _ ij_javascript_file_name_style = relaxed ij_javascript_finally_on_new_line = false -ij_javascript_for_brace_force = never +ij_javascript_for_brace_force = always ij_javascript_for_statement_new_line_after_left_paren = false ij_javascript_for_statement_right_paren_on_new_line = false ij_javascript_for_statement_wrap = off @@ -267,7 +267,7 @@ ij_javascript_use_path_mapping = always ij_javascript_use_public_modifier = false ij_javascript_use_semicolon_after_statement = true ij_javascript_var_declaration_wrap = normal -ij_javascript_while_brace_force = never +ij_javascript_while_brace_force = always ij_javascript_while_on_new_line = false ij_javascript_wrap_comments = false From dd942997cbed066a9777fca163f14ecc503bbcb9 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Fri, 18 Sep 2020 14:22:28 +0200 Subject: [PATCH 3/3] :art: Fix invalid formatting introduced in 827b4b5bbe9613104fd9390db0756ab2611a1595 --- js/table-selectable-lines.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/js/table-selectable-lines.js b/js/table-selectable-lines.js index b4b583d8e9..e4e5aad8a8 100644 --- a/js/table-selectable-lines.js +++ b/js/table-selectable-lines.js @@ -95,24 +95,19 @@ $(document).ready(function () { * @returns {boolean} true if our custom handler shouldn't be run */ function shouldExitHandler($eventTarget) { - if ($eventTarget.is("table")) - { // might happen on cell padding/margin/border + if ($eventTarget.is("table")) { // might happen on cell padding/margin/border return true; } - if ($eventTarget.is("a, button")) - { + if ($eventTarget.is("a, button")) { return true; } - if ($eventTarget.parent().is("a, button")) - { + if ($eventTarget.parent().is("a, button")) { return true; } - if ($eventTarget.is("input, select, option")) - { + if ($eventTarget.is("input, select, option")) { return true; } - if ($eventTarget.is("img")) - { // too hard to determine if an event handler is attached so excluding all ! + if ($eventTarget.is("img")) { // too hard to determine if an event handler is attached so excluding all ! return true; }