From 793e86fce66f356099792b7231c9a1d949ff875e Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 29 Aug 2017 11:38:53 +0200 Subject: update prettier --- .../src/main/js/components/SelectList/index.js | 14 +++-- .../js/components/SourceViewer/SourceViewerBase.js | 10 ++-- .../js/components/SourceViewer/SourceViewerCode.js | 62 ++++++++++++---------- .../components/SourceViewer/SourceViewerHeader.js | 35 +++++++----- .../js/components/SourceViewer/components/Line.js | 24 +++++---- .../components/SourceViewer/components/LineCode.js | 14 ++--- .../SourceViewer/components/LineCoverage.js | 14 ++--- .../components/LineDuplicationBlock.js | 12 +++-- .../SourceViewer/components/LineDuplications.js | 12 +++-- .../SourceViewer/components/LineIssuesIndicator.js | 5 +- .../SourceViewer/components/LineIssuesList.js | 4 +- .../components/SourceViewer/components/LineSCM.js | 5 +- .../SourceViewer/views/measures-overlay.js | 23 ++++++-- .../main/js/components/charts/AdvancedTimeline.js | 34 +++++++----- .../src/main/js/components/charts/BubbleChart.js | 50 +++++------------ .../main/js/components/charts/ColorBoxLegend.js | 9 ++-- .../js/components/charts/ColorGradientLegend.js | 13 ++--- .../js/components/charts/ColorRatingsLegend.js | 4 +- .../src/main/js/components/charts/TreeMap.js | 8 +-- .../src/main/js/components/charts/TreeMapRect.js | 15 ++++-- .../src/main/js/components/charts/ZoomTimeLine.js | 36 ++++++++----- .../src/main/js/components/charts/bar-chart.js | 22 +++----- .../src/main/js/components/charts/donut-chart.js | 12 +++-- .../src/main/js/components/charts/histogram.js | 22 +++----- .../src/main/js/components/charts/line-chart.js | 24 ++------- .../src/main/js/components/charts/word-cloud.js | 12 ++--- .../src/main/js/components/common/BranchStatus.tsx | 20 +++---- .../js/components/common/BubblePopupHelper.tsx | 5 +- .../main/js/components/common/DeferredSpinner.js | 8 +-- .../src/main/js/components/common/EmptySearch.js | 13 ++--- .../main/js/components/common/LocationMessage.css | 2 +- .../src/main/js/components/common/MarkdownTips.js | 12 ++--- .../src/main/js/components/common/MultiSelect.js | 13 ++--- .../src/main/js/components/common/SelectList.js | 4 +- .../js/components/common/UpgradeOrganizationBox.js | 13 ++--- .../js/components/common/VisibilitySelector.tsx | 54 +++++++++---------- .../components/common/__tests__/SelectList-test.js | 8 +-- .../js/components/common/action-options-view.js | 16 ++++-- .../src/main/js/components/common/modal-form.js | 5 +- .../src/main/js/components/controls/DateInput.tsx | 5 +- .../main/js/components/controls/GlobalMessages.js | 6 +-- .../main/js/components/controls/RadioToggle.tsx | 10 +--- .../main/js/components/controls/SearchSelect.js | 8 +-- .../src/main/js/components/controls/styles.css | 2 +- .../src/main/js/components/facet/FacetBox.js | 6 +-- .../src/main/js/components/facet/FacetHeader.js | 55 ++++++++++--------- .../src/main/js/components/facet/FacetItem.js | 30 ++++------- .../src/main/js/components/facet/FacetItemsList.js | 6 +-- .../js/components/icons-components/BranchIcon.tsx | 8 +-- .../components/icons-components/QualifierIcon.js | 48 ++++++++++------- .../js/components/intl/DateTooltipFormatter.tsx | 5 +- .../js/components/intl/TimeTooltipFormatter.tsx | 5 +- .../src/main/js/components/issue/IssueView.js | 14 ++--- .../components/issue/components/IssueActionsBar.js | 10 ++-- .../js/components/issue/components/IssueAssign.js | 5 +- .../issue/components/IssueChangelogDiff.js | 6 +-- .../issue/components/IssueCommentAction.js | 4 +- .../issue/components/IssueCommentLine.js | 10 ++-- .../components/issue/components/IssueTitleBar.js | 31 ++++++----- .../components/__tests__/IssueTitleBar-test.js | 7 ++- .../js/components/issue/popups/ChangelogPopup.js | 9 ++-- .../components/issue/popups/CommentDeletePopup.js | 4 +- .../js/components/issue/popups/SetAssigneePopup.js | 9 ++-- .../js/components/issue/popups/SetSeverityPopup.js | 4 +- .../js/components/issue/popups/SetTypePopup.js | 4 +- .../components/issue/popups/SimilarIssuesPopup.js | 51 +++++++++--------- .../src/main/js/components/measure/Measure.js | 10 +--- .../src/main/js/components/nav/NavBar.css | 4 +- .../src/main/js/components/nav/NavBar.tsx | 4 +- .../src/main/js/components/select-list/list.js | 6 +-- .../src/main/js/components/shared/Organization.js | 12 +++-- .../src/main/js/components/shared/TypeHelper.js | 5 +- .../src/main/js/components/tags/TagsList.js | 4 +- .../main/js/components/ui/DuplicationsRating.css | 2 +- .../src/main/js/components/ui/IssueTypeIcon.tsx | 6 +-- .../sonar-web/src/main/js/components/ui/Level.tsx | 6 +-- .../sonar-web/src/main/js/components/ui/Rating.js | 6 +-- .../src/main/js/components/ui/SizeRating.js | 6 +-- .../src/main/js/components/widgets/barchart.js | 4 +- .../workspace/views/viewer-header-view.js | 8 ++- 80 files changed, 549 insertions(+), 564 deletions(-) (limited to 'server/sonar-web/src/main/js/components') diff --git a/server/sonar-web/src/main/js/components/SelectList/index.js b/server/sonar-web/src/main/js/components/SelectList/index.js index 23e2c7184eb..af02287019c 100644 --- a/server/sonar-web/src/main/js/components/SelectList/index.js +++ b/server/sonar-web/src/main/js/components/SelectList/index.js @@ -202,9 +202,12 @@ const SelectListView = Backbone.View.extend({ this.$listContainer = this.$('.select-list-list-container'); if (!this.settings.readOnly) { - this.$listContainer.height(this.settings.height).css('overflow', 'auto').on('scroll', () => { - that.scroll(); - }); + this.$listContainer + .height(this.settings.height) + .css('overflow', 'auto') + .on('scroll', () => { + that.scroll(); + }); } else { this.$listContainer.addClass('select-list-list-container-readonly'); } @@ -230,7 +233,10 @@ const SelectListView = Backbone.View.extend({ } that.$el.prevAll('.alert').remove(); - $('
').addClass('alert alert-danger').text(message).insertBefore(that.$el); + $('
') + .addClass('alert alert-danger') + .text(message) + .insertBefore(that.$el); }; if (this.settings.readOnly) { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.js b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.js index 9f41c7a8a8e..6d3a4378b2f 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.js @@ -653,14 +653,16 @@ export default class SourceViewerBase extends React.PureComponent { component={this.state.component} showMeasures={this.showMeasures} /> - {notAccessible && + {notAccessible && (
{translate('code_viewer.no_source_code_displayed_due_to_security')} -
} - {sourceRemoved && +
+ )} + {sourceRemoved && (
{translate('code_viewer.no_source_code_displayed_due_to_source_removed')} -
} +
+ )} {displaySources && sources != null && this.renderCode(sources)} ); diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.js b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.js index f928aa8f5fc..55fb081c59d 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.js @@ -198,21 +198,24 @@ export default class SourceViewerCode extends React.PureComponent { return (
- {this.props.hasSourcesBefore && + {this.props.hasSourcesBefore && (
- {this.props.loadingSourcesBefore - ?
- - - {translate('source_viewer.loading_more_code')} - -
- : } -
} + {this.props.loadingSourcesBefore ? ( +
+ + + {translate('source_viewer.loading_more_code')} + +
+ ) : ( + + )} +
+ )} @@ -231,21 +234,24 @@ export default class SourceViewerCode extends React.PureComponent {
- {this.props.hasSourcesAfter && + {this.props.hasSourcesAfter && (
- {this.props.loadingSourcesAfter - ?
- - - {translate('source_viewer.loading_more_code')} - -
- : } -
} + {this.props.loadingSourcesAfter ? ( +
+ + + {translate('source_viewer.loading_more_code')} + +
+ ) : ( + + )} + + )} ); } diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.js b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.js index 991ec78a765..282f7211b1a 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.js @@ -96,18 +96,20 @@ export default class SourceViewerHeader extends React.PureComponent { - {subProject != null && + {subProject != null && (
{subProjectName} -
} + + )}
{collapsedDirFromPath(path)} {fileFromPath(path)} - {this.props.component.canMarkAsFavorite && - } + {this.props.component.canMarkAsFavorite && ( + + )}
@@ -135,12 +137,13 @@ export default class SourceViewerHeader extends React.PureComponent { {translate('component_viewer.new_window')} - {!workspace && + {!workspace && (
  • {translate('component_viewer.open_in_workspace')} -
    • } + + )}
  • {translate('component_viewer.show_raw_source')} @@ -150,7 +153,7 @@ export default class SourceViewerHeader extends React.PureComponent {
    - {isUnitTest && + {isUnitTest && (
    {formatMeasure(measures.tests, 'SHORT_INT')} @@ -158,9 +161,10 @@ export default class SourceViewerHeader extends React.PureComponent { {translate('metric.tests.name')} -
    } +
    + )} - {!isUnitTest && + {!isUnitTest && (
    {formatMeasure(measures.lines, 'SHORT_INT')} @@ -168,7 +172,8 @@ export default class SourceViewerHeader extends React.PureComponent { {translate('metric.lines.name')} -
    } + + )}
    @@ -189,7 +194,7 @@ export default class SourceViewerHeader extends React.PureComponent {
    - {measures.coverage != null && + {measures.coverage != null && (
    {formatMeasure(measures.coverage, 'PERCENT')} @@ -197,9 +202,10 @@ export default class SourceViewerHeader extends React.PureComponent { {translate('metric.coverage.name')} -
    } + + )} - {measures.duplicationDensity != null && + {measures.duplicationDensity != null && (
    {formatMeasure(measures.duplicationDensity, 'PERCENT')} @@ -207,7 +213,8 @@ export default class SourceViewerHeader extends React.PureComponent { {translate('duplications')} -
    } + + )} ); diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/Line.js b/server/sonar-web/src/main/js/components/SourceViewer/components/Line.js index 10f84254b27..1d81eb24712 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/Line.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/Line.js @@ -113,13 +113,15 @@ export default class Line extends React.PureComponent { previousLine={this.props.previousLine} /> - {this.props.displayCoverage && - } + {this.props.displayCoverage && ( + + )} - {this.props.displayDuplications && - } + {this.props.displayDuplications && ( + + )} - {times(duplicationsCount).map(index => + {times(duplicationsCount).map(index => ( - )} + ))} {this.props.displayIssues && - !this.props.displayAllIssues && + !this.props.displayAllIssues && ( } + /> + )} - {this.props.displayFiltered && + {this.props.displayFiltered && (
    - } + + )} {index + 1} - {message != null && - - {message} - } + {message != null && {message}} ); } @@ -213,12 +210,10 @@ export default class LineCode extends React.PureComponent { return (
    - 
     (this.codeNode = node)}>
-            {renderedTokens}
-
    + 
     (this.codeNode = node)}>{renderedTokens}
    {showIssues && - issues.length > 0 && + issues.length > 0 && ( } + /> + )} ); } diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.js b/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.js index 70d3bc3d258..a8821c57a24 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.js @@ -54,12 +54,12 @@ export default class LineCoverage extends React.PureComponent { ); - return line.coverageStatus != null - ? - {cell} - - : cell; + return line.coverageStatus != null ? ( + + {cell} + + ) : ( + cell + ); } } diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.js b/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.js index c079ee52490..396d7244dee 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.js @@ -60,10 +60,12 @@ export default class LineDuplicationBlock extends React.PureComponent { ); - return duplicated - ? - {cell} - - : cell; + return duplicated ? ( + + {cell} + + ) : ( + cell + ); } } diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplications.js b/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplications.js index 2e394b89b9c..4c5c90a7e0f 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplications.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplications.js @@ -55,10 +55,12 @@ export default class LineDuplications extends React.PureComponent { ); - return line.duplicated - ? - {cell} - - : cell; + return line.duplicated ? ( + + {cell} + + ) : ( + cell + ); } } diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.js b/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.js index 1c3db0733f5..43a7b4561a0 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.js @@ -57,10 +57,7 @@ export default class LineIssuesIndicator extends React.PureComponent { tabIndex={hasIssues ? '0' : undefined} onClick={hasIssues ? this.handleClick : undefined}> {mostImportantIssue != null && } - {issues.length > 1 && - - {issues.length} - } + {issues.length > 1 && {issues.length}} ); } diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesList.js b/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesList.js index 470cf536cea..e3f12d153be 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesList.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesList.js @@ -41,7 +41,7 @@ export default class LineIssuesList extends React.PureComponent { return (
    - {issues.map(issue => + {issues.map(issue => ( - )} + ))}
    ); } diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.js b/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.js index abcaa287007..01ef4805057 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.js @@ -55,8 +55,9 @@ export default class LineSCM extends React.PureComponent { role={clickable ? 'button' : undefined} tabIndex={clickable ? 0 : undefined} onClick={clickable ? this.handleClick : undefined}> - {this.isSCMChanged(line, previousLine) && -
    } + {this.isSCMChanged(line, previousLine) && ( +
    + )} ); } diff --git a/server/sonar-web/src/main/js/components/SourceViewer/views/measures-overlay.js b/server/sonar-web/src/main/js/components/SourceViewer/views/measures-overlay.js index d9d7eb25c31..e9db36ae7b7 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/views/measures-overlay.js +++ b/server/sonar-web/src/main/js/components/SourceViewer/views/measures-overlay.js @@ -74,16 +74,27 @@ export default ModalView.extend({ const radius = options.size / 2; const container = select(this); - const svg = container.append('svg').attr('width', options.size).attr('height', options.size); + const svg = container + .append('svg') + .attr('width', options.size) + .attr('height', options.size); const plot = svg.append('g').attr('transform', trans(radius, radius)); - const arc = d3Arc().innerRadius(radius - options.thickness).outerRadius(radius); - const pie = d3Pie().sort(null).value(d => d); + const arc = d3Arc() + .innerRadius(radius - options.thickness) + .outerRadius(radius); + const pie = d3Pie() + .sort(null) + .value(d => d); const colors = function(i) { return i === 0 ? options.color : options.baseColor; }; const sectors = plot.selectAll('path').data(pie(data)); - sectors.enter().append('path').style('fill', (d, i) => colors(i)).attr('d', arc); + sectors + .enter() + .append('path') + .style('fill', (d, i) => colors(i)) + .attr('d', arc); }); }, @@ -250,7 +261,9 @@ export default ModalView.extend({ const testId = $(e.currentTarget).data('id'); const url = window.baseUrl + '/api/tests/covered_files'; const options = { testId }; - this.testsScroll = $(e.currentTarget).scrollParent().scrollTop(); + this.testsScroll = $(e.currentTarget) + .scrollParent() + .scrollTop(); return $.get(url, options).done(data => { this.coveredFiles = data.files; this.selectedTest = this.tests.find(test => test.id === testId); diff --git a/server/sonar-web/src/main/js/components/charts/AdvancedTimeline.js b/server/sonar-web/src/main/js/components/charts/AdvancedTimeline.js index d359b8c0e54..eb566d16706 100644 --- a/server/sonar-web/src/main/js/components/charts/AdvancedTimeline.js +++ b/server/sonar-web/src/main/js/components/charts/AdvancedTimeline.js @@ -134,10 +134,14 @@ export default class AdvancedTimeline extends React.PureComponent { } getRatingScale = (availableHeight /*: number */) => - scalePoint().domain([5, 4, 3, 2, 1]).range([availableHeight, 0]); + scalePoint() + .domain([5, 4, 3, 2, 1]) + .range([availableHeight, 0]); getLevelScale = (availableHeight /*: number */) => - scalePoint().domain(['ERROR', 'WARN', 'OK']).range([availableHeight, 0]); + scalePoint() + .domain(['ERROR', 'WARN', 'OK']) + .range([availableHeight, 0]); getYScale = (props /*: Props */, availableHeight /*: number */, flatData /*: Array */) => { if (props.metricType === 'RATING') { @@ -160,7 +164,10 @@ export default class AdvancedTimeline extends React.PureComponent { const dateRange = extent(flatData, d => d.x); const start = startDate && startDate > dateRange[0] ? startDate : dateRange[0]; const end = endDate && endDate < dateRange[1] ? endDate : dateRange[1]; - const xScale = scaleTime().domain(sortBy([start, end])).range([0, availableWidth]).clamp(false); + const xScale = scaleTime() + .domain(sortBy([start, end])) + .range([0, availableWidth]) + .clamp(false); return { xScale, maxXRange: dateRange.map(xScale) @@ -302,9 +309,9 @@ export default class AdvancedTimeline extends React.PureComponent { return ( - {ticks.map(tick => + {ticks.map(tick => ( - {formatYTick != null && + {formatYTick != null && ( {formatYTick(tick)} - } + + )} - )} + ))} ); }; @@ -376,13 +384,13 @@ export default class AdvancedTimeline extends React.PureComponent { } return ( - {this.props.series.map((serie, idx) => + {this.props.series.map((serie, idx) => ( - )} + ))} ); }; @@ -398,13 +406,13 @@ export default class AdvancedTimeline extends React.PureComponent { } return ( - {this.props.series.map((serie, idx) => + {this.props.series.map((serie, idx) => ( - )} + ))} ); }; @@ -421,14 +429,14 @@ export default class AdvancedTimeline extends React.PureComponent { const offset = eventSize / 2; return ( - {inRangeEvents.map((event, idx) => + {inRangeEvents.map((event, idx) => ( - )} + ))} ); }; diff --git a/server/sonar-web/src/main/js/components/charts/BubbleChart.js b/server/sonar-web/src/main/js/components/charts/BubbleChart.js index 3426761dc5f..4b733da414c 100644 --- a/server/sonar-web/src/main/js/components/charts/BubbleChart.js +++ b/server/sonar-web/src/main/js/components/charts/BubbleChart.js @@ -77,20 +77,16 @@ export class Bubble extends React.PureComponent { ); if (this.props.link && !this.props.onClick) { - circle = ( - - {circle} - - ); + circle = {circle}; } - return this.props.tooltip - ? - - {circle} - - - : circle; + return this.props.tooltip ? ( + + {circle} + + ) : ( + circle + ); } } @@ -166,11 +162,7 @@ export default class BubbleChart extends React.PureComponent { return ; }); - return ( - - {lines} - - ); + return {lines}; } renderYGrid(ticks /*: Array */, xScale /*: Scale */, yScale /*: Scale */) { @@ -185,11 +177,7 @@ export default class BubbleChart extends React.PureComponent { return ; }); - return ( - - {lines} - - ); + return {lines}; } renderXTicks(xTicks /*: Array */, xScale /*: Scale */, yScale /*: Scale */) { @@ -208,11 +196,7 @@ export default class BubbleChart extends React.PureComponent { ); }); - return ( - - {ticks} - - ); + return {ticks}; } renderYTicks(yTicks /*: Array */, xScale /*: Scale */, yScale /*: Scale */) { @@ -237,11 +221,7 @@ export default class BubbleChart extends React.PureComponent { ); }); - return ( - - {ticks} - - ); + return {ticks}; } renderChart(width /*: number */) { @@ -298,10 +278,6 @@ export default class BubbleChart extends React.PureComponent { } render() { - return ( - - {size => this.renderChart(size.width)} - - ); + return {size => this.renderChart(size.width)}; } } diff --git a/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.js b/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.js index da60f2f7ab1..4c6633c26b1 100644 --- a/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.js +++ b/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.js @@ -36,7 +36,7 @@ export default function ColorBoxLegend( const colorRange = colorScale.range(); return (
    - {colorDomain.map((value, idx) => + {colorDomain.map((value, idx) => (
    {formatMeasure(value, metricType)}
    - )} - {colorNA && + ))} + {colorNA && (
    N/A -
    } +
    + )}
    ); } diff --git a/server/sonar-web/src/main/js/components/charts/ColorGradientLegend.js b/server/sonar-web/src/main/js/components/charts/ColorGradientLegend.js index e67d19644c9..78b09098b1e 100644 --- a/server/sonar-web/src/main/js/components/charts/ColorGradientLegend.js +++ b/server/sonar-web/src/main/js/components/charts/ColorGradientLegend.js @@ -57,14 +57,14 @@ export default function ColorGradientLegend( - {colorRange.map((color, idx) => + {colorRange.map((color, idx) => ( - )} + ))} - {colorDomain.map((d, idx) => + {colorDomain.map((d, idx) => ( {d} - )} + ))} - {colorNA && + {colorNA && ( N/A - } + + )} ); } diff --git a/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.js b/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.js index 67017ea7d80..daa623fb780 100644 --- a/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.js +++ b/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.js @@ -26,7 +26,7 @@ import { RATING_COLORS } from '../../helpers/constants'; export default function ColorRatingsLegend({ className } /*: { className?: string } */) { return (
    - {[1, 2, 3, 4, 5].map(rating => + {[1, 2, 3, 4, 5].map(rating => (
    {formatMeasure(rating, 'RATING')}
    - )} + ))}
    ); } diff --git a/server/sonar-web/src/main/js/components/charts/TreeMap.js b/server/sonar-web/src/main/js/components/charts/TreeMap.js index 21ae66da1bb..256a5afb1d2 100644 --- a/server/sonar-web/src/main/js/components/charts/TreeMap.js +++ b/server/sonar-web/src/main/js/components/charts/TreeMap.js @@ -80,7 +80,9 @@ export default class TreeMap extends React.PureComponent { .sum(d => d.size) .sort((a, b) => b.value - a.value); - const treemap = d3Treemap().round(true).size([width, height]); + const treemap = d3Treemap() + .round(true) + .size([width, height]); const nodes = treemap(hierarchy).leaves(); const prefix = this.mostCommitPrefix(items.map(item => item.label)); @@ -88,7 +90,7 @@ export default class TreeMap extends React.PureComponent { return (
    - {nodes.map(node => + {nodes.map(node => ( - )} + ))}
    ); diff --git a/server/sonar-web/src/main/js/components/charts/TreeMapRect.js b/server/sonar-web/src/main/js/components/charts/TreeMapRect.js index 357bd6e5c4e..42013d0cf2b 100644 --- a/server/sonar-web/src/main/js/components/charts/TreeMapRect.js +++ b/server/sonar-web/src/main/js/components/charts/TreeMapRect.js @@ -25,7 +25,10 @@ import { scaleLinear } from 'd3-scale'; import LinkIcon from '../icons-components/LinkIcon'; import Tooltip from '../controls/Tooltip'; -const SIZE_SCALE = scaleLinear().domain([3, 15]).range([11, 18]).clamp(true); +const SIZE_SCALE = scaleLinear() + .domain([3, 15]) + .range([11, 18]) + .clamp(true); /*:: type Props = {| x: number, @@ -93,12 +96,14 @@ export default class TreeMapRect extends React.PureComponent { role="treeitem" tabIndex={0}>
    - {isIconVisible && + {isIconVisible && ( {this.props.icon} - } - {isTextVisible && - } + + )} + {isTextVisible && ( + + )}
    {this.renderLink()}
    diff --git a/server/sonar-web/src/main/js/components/charts/ZoomTimeLine.js b/server/sonar-web/src/main/js/components/charts/ZoomTimeLine.js index 22205dfdf73..ec1957e2f5b 100644 --- a/server/sonar-web/src/main/js/components/charts/ZoomTimeLine.js +++ b/server/sonar-web/src/main/js/components/charts/ZoomTimeLine.js @@ -71,10 +71,14 @@ export default class ZoomTimeLine extends React.PureComponent { } getRatingScale = (availableHeight /*: number */) => - scalePoint().domain([5, 4, 3, 2, 1]).range([availableHeight, 0]); + scalePoint() + .domain([5, 4, 3, 2, 1]) + .range([availableHeight, 0]); getLevelScale = (availableHeight /*: number */) => - scalePoint().domain(['ERROR', 'WARN', 'OK']).range([availableHeight, 0]); + scalePoint() + .domain(['ERROR', 'WARN', 'OK']) + .range([availableHeight, 0]); getYScale = (availableHeight /*: number */, flatData /*: Array */) => { if (this.props.metricType === 'RATING') { @@ -82,12 +86,18 @@ export default class ZoomTimeLine extends React.PureComponent { } else if (this.props.metricType === 'LEVEL') { return this.getLevelScale(availableHeight); } else { - return scaleLinear().range([availableHeight, 0]).domain([0, max(flatData, d => d.y)]).nice(); + return scaleLinear() + .range([availableHeight, 0]) + .domain([0, max(flatData, d => d.y)]) + .nice(); } }; getXScale = (availableWidth /*: number */, flatData /*: Array */) => - scaleTime().domain(extent(flatData, d => d.x)).range([0, availableWidth]).clamp(true); + scaleTime() + .domain(extent(flatData, d => d.x)) + .range([0, availableWidth]) + .clamp(true); getScales = () => { const availableWidth = this.props.width - this.props.padding[1] - this.props.padding[3]; @@ -241,13 +251,13 @@ export default class ZoomTimeLine extends React.PureComponent { } return ( - {this.props.series.map((serie, idx) => + {this.props.series.map((serie, idx) => ( - )} + ))} ); }; @@ -263,13 +273,13 @@ export default class ZoomTimeLine extends React.PureComponent { } return ( - {this.props.series.map((serie, idx) => + {this.props.series.map((serie, idx) => ( - )} + ))} ); }; @@ -283,7 +293,7 @@ export default class ZoomTimeLine extends React.PureComponent { xDim: Array, direction: string } */ - ) => + ) => ( - ; + + ); renderZoom = (xScale /*: Scale */, yScale /*: Scale */) => { const xRange = xScale.range(); @@ -338,7 +349,7 @@ export default class ZoomTimeLine extends React.PureComponent { width={xDim[1] - xDim[0]} /> - {showZoomArea && + {showZoomArea && ( - } + + )} {showZoomArea && this.renderZoomHandle({ xScale, diff --git a/server/sonar-web/src/main/js/components/charts/bar-chart.js b/server/sonar-web/src/main/js/components/charts/bar-chart.js index 37e847d580d..8e963366f67 100644 --- a/server/sonar-web/src/main/js/components/charts/bar-chart.js +++ b/server/sonar-web/src/main/js/components/charts/bar-chart.js @@ -84,11 +84,7 @@ export const BarChart = createReactClass({ ); }); - return ( - - {ticks} - - ); + return {ticks}; }, renderXValues(xScale, yScale) { @@ -119,11 +115,7 @@ export const BarChart = createReactClass({ ); }); - return ( - - {ticks} - - ); + return {ticks}; }, renderBars(xScale, yScale) { @@ -151,11 +143,7 @@ export const BarChart = createReactClass({ /> ); }); - return ( - - {bars} - - ); + return {bars}; }, render() { @@ -176,7 +164,9 @@ export const BarChart = createReactClass({ .domain(this.props.data.map(d => d.x)) .range([0, availableWidth]) .paddingInner(relativeInnerPadding); - const yScale = scaleLinear().domain([0, maxY]).range([availableHeight, 0]); + const yScale = scaleLinear() + .domain([0, maxY]) + .range([availableHeight, 0]); return ( diff --git a/server/sonar-web/src/main/js/components/charts/donut-chart.js b/server/sonar-web/src/main/js/components/charts/donut-chart.js index 9acec66a199..6cbf26f5d8b 100644 --- a/server/sonar-web/src/main/js/components/charts/donut-chart.js +++ b/server/sonar-web/src/main/js/components/charts/donut-chart.js @@ -25,7 +25,9 @@ import { ResizeMixin } from './../mixins/resize-mixin'; import { TooltipsMixin } from './../mixins/tooltips-mixin'; function Sector(props) { - const arc = d3Arc().outerRadius(props.radius).innerRadius(props.radius - props.thickness); + const arc = d3Arc() + .outerRadius(props.radius) + .innerRadius(props.radius - props.thickness); return ; } @@ -57,7 +59,9 @@ export const DonutChart = createReactClass({ const size = Math.min(availableWidth, availableHeight); const radius = Math.floor(size / 2); - const pie = d3Pie().sort(null).value(d => d.value); + const pie = d3Pie() + .sort(null) + .value(d => d.value); const sectors = pie(this.props.data).map((d, i) => { return ( - - {sectors} - + {sectors} ); diff --git a/server/sonar-web/src/main/js/components/charts/histogram.js b/server/sonar-web/src/main/js/components/charts/histogram.js index ddf8726181e..2201cf025c0 100644 --- a/server/sonar-web/src/main/js/components/charts/histogram.js +++ b/server/sonar-web/src/main/js/components/charts/histogram.js @@ -86,11 +86,7 @@ export const Histogram = createReactClass({ ); }); - return ( - - {ticks} - - ); + return {ticks}; }, renderValues(xScale, yScale) { @@ -115,11 +111,7 @@ export const Histogram = createReactClass({ ); }); - return ( - - {ticks} - - ); + return {ticks}; }, renderBars(xScale, yScale) { @@ -140,11 +132,7 @@ export const Histogram = createReactClass({ /> ); }); - return ( - - {bars} - - ); + return {bars}; }, render() { @@ -156,7 +144,9 @@ export const Histogram = createReactClass({ const availableHeight = this.state.height - this.props.padding[0] - this.props.padding[2]; const maxX = max(this.props.data, d => d.x); - const xScale = scaleLinear().domain([0, maxX]).range([0, availableWidth]); + const xScale = scaleLinear() + .domain([0, maxX]) + .range([0, availableWidth]); const yScale = scaleBand() .domain(this.props.data.map(d => d.y)) .rangeRound([0, availableHeight]); diff --git a/server/sonar-web/src/main/js/components/charts/line-chart.js b/server/sonar-web/src/main/js/components/charts/line-chart.js index ea56aa7e6ca..20df2fce140 100644 --- a/server/sonar-web/src/main/js/components/charts/line-chart.js +++ b/server/sonar-web/src/main/js/components/charts/line-chart.js @@ -87,11 +87,7 @@ export const LineChart = createReactClass({ const y = yScale(point.y); return ; }); - return ( - - {points} - - ); + return {points}; }, renderVerticalGrid(xScale, yScale) { @@ -104,11 +100,7 @@ export const LineChart = createReactClass({ const y2 = yScale(point.y); return ; }); - return ( - - {lines} - - ); + return {lines}; }, renderXTicks(xScale, yScale) { @@ -125,11 +117,7 @@ export const LineChart = createReactClass({ ); }); - return ( - - {ticks} - - ); + return {ticks}; }, renderXValues(xScale, yScale) { @@ -146,11 +134,7 @@ export const LineChart = createReactClass({ ); }); - return ( - - {ticks} - - ); + return {ticks}; }, renderLine(xScale, yScale) { diff --git a/server/sonar-web/src/main/js/components/charts/word-cloud.js b/server/sonar-web/src/main/js/components/charts/word-cloud.js index c7547ebdf87..8cc711a4eec 100644 --- a/server/sonar-web/src/main/js/components/charts/word-cloud.js +++ b/server/sonar-web/src/main/js/components/charts/word-cloud.js @@ -67,13 +67,13 @@ export const WordCloud = createReactClass({ const len = this.props.items.length; const sortedItems = sortBy(this.props.items, (item, idx) => { const index = len - idx; - return index % 2 * (len - index) + index / 2; + return (index % 2) * (len - index) + index / 2; }); const sizeScale = scaleLinear() .domain([0, max(this.props.items, d => d.size)]) .range(this.props.sizeRange); - const words = sortedItems.map((item, index) => + const words = sortedItems.map((item, index) => ( - ); - return ( -
    - {words} -
    - ); + )); + return
    {words}
    ; } }); diff --git a/server/sonar-web/src/main/js/components/common/BranchStatus.tsx b/server/sonar-web/src/main/js/components/common/BranchStatus.tsx index ae36462f6f5..ea1604dfa5c 100644 --- a/server/sonar-web/src/main/js/components/common/BranchStatus.tsx +++ b/server/sonar-web/src/main/js/components/common/BranchStatus.tsx @@ -51,25 +51,25 @@ export default function BranchStatus({ branch, concise = false }: Props) { })} />
    • - {concise && -
  • - {totalIssues} -
    • } - {!concise && + {concise &&
  • {totalIssues}
    • } + {!concise && (
  • {branch.status.bugs} -
    • } - {!concise && + + )} + {!concise && (
  • {branch.status.vulnerabilities} -
    • } - {!concise && + + )} + {!concise && (
  • {branch.status.codeSmells} -
    • } + + )} ); } else { diff --git a/server/sonar-web/src/main/js/components/common/BubblePopupHelper.tsx b/server/sonar-web/src/main/js/components/common/BubblePopupHelper.tsx index f24365adf57..5ea55cabf6b 100644 --- a/server/sonar-web/src/main/js/components/common/BubblePopupHelper.tsx +++ b/server/sonar-web/src/main/js/components/common/BubblePopupHelper.tsx @@ -93,12 +93,13 @@ export default class BubblePopupHelper extends React.PureComponent tabIndex={0} role="tooltip"> {this.props.children} - {this.props.isOpen && + {this.props.isOpen && (
    (this.popupContainer = popupContainer)}> {React.cloneElement(this.props.popup, { popupPosition: this.state.position })} -
    } + + )} ); } diff --git a/server/sonar-web/src/main/js/components/common/DeferredSpinner.js b/server/sonar-web/src/main/js/components/common/DeferredSpinner.js index 4224bdf786a..f638257ad79 100644 --- a/server/sonar-web/src/main/js/components/common/DeferredSpinner.js +++ b/server/sonar-web/src/main/js/components/common/DeferredSpinner.js @@ -80,8 +80,10 @@ export default class DeferredSpinner extends React.PureComponent { }; render() { - return this.state.showSpinner - ? - : this.props.children || null; + return this.state.showSpinner ? ( + + ) : ( + this.props.children || null + ); } } diff --git a/server/sonar-web/src/main/js/components/common/EmptySearch.js b/server/sonar-web/src/main/js/components/common/EmptySearch.js index 8a426f4474c..719a2239c90 100644 --- a/server/sonar-web/src/main/js/components/common/EmptySearch.js +++ b/server/sonar-web/src/main/js/components/common/EmptySearch.js @@ -22,14 +22,11 @@ import React from 'react'; import { translate } from '../../helpers/l10n'; import './EmptySearch.css'; -const EmptySearch = () => +const EmptySearch = () => (
    -

    - {translate('no_results_search')} -

    -

    - {translate('no_results_search.2')} -

    -
    ; +

    {translate('no_results_search')}

    +

    {translate('no_results_search.2')}

    + +); export default EmptySearch; diff --git a/server/sonar-web/src/main/js/components/common/LocationMessage.css b/server/sonar-web/src/main/js/components/common/LocationMessage.css index 0d9951513c1..c2021568b94 100644 --- a/server/sonar-web/src/main/js/components/common/LocationMessage.css +++ b/server/sonar-web/src/main/js/components/common/LocationMessage.css @@ -34,7 +34,7 @@ border-top: 5px solid #475760; border-left: 5px solid transparent; border-right: 5px solid transparent; - content: ""; + content: ''; } .source-line-code .location-message { diff --git a/server/sonar-web/src/main/js/components/common/MarkdownTips.js b/server/sonar-web/src/main/js/components/common/MarkdownTips.js index b57bce846f0..12479be7596 100644 --- a/server/sonar-web/src/main/js/components/common/MarkdownTips.js +++ b/server/sonar-web/src/main/js/components/common/MarkdownTips.js @@ -35,15 +35,9 @@ export default class MarkdownTips extends React.PureComponent { {translate('markdown.helplink')}     {':'} - - *{translate('bold')}* - - - ``{translate('code')}`` - - - * {translate('bulleted_point')} - + *{translate('bold')}* + ``{translate('code')}`` + * {translate('bulleted_point')} ); } diff --git a/server/sonar-web/src/main/js/components/common/MultiSelect.js b/server/sonar-web/src/main/js/components/common/MultiSelect.js index 2f7ca2aa923..2547da0d2b5 100644 --- a/server/sonar-web/src/main/js/components/common/MultiSelect.js +++ b/server/sonar-web/src/main/js/components/common/MultiSelect.js @@ -246,7 +246,7 @@ export default class MultiSelect extends React.PureComponent {
      {selectedElements.length > 0 && - selectedElements.map(element => + selectedElements.map(element => ( - )} + ))} {unselectedElements.length > 0 && - unselectedElements.map(element => + unselectedElements.map(element => ( - )} - {this.isNewElement(query, this.props) && + ))} + {this.isNewElement(query, this.props) && ( } + /> + )}
    ); diff --git a/server/sonar-web/src/main/js/components/common/SelectList.js b/server/sonar-web/src/main/js/components/common/SelectList.js index 02483a86e55..b235e9abec9 100644 --- a/server/sonar-web/src/main/js/components/common/SelectList.js +++ b/server/sonar-web/src/main/js/components/common/SelectList.js @@ -148,7 +148,7 @@ export default class SelectList extends React.PureComponent { }) )} {!hasChildren && - this.props.items.map(item => + this.props.items.map(item => ( - )} + ))} ); } diff --git a/server/sonar-web/src/main/js/components/common/UpgradeOrganizationBox.js b/server/sonar-web/src/main/js/components/common/UpgradeOrganizationBox.js index 35e56013aef..23456925d25 100644 --- a/server/sonar-web/src/main/js/components/common/UpgradeOrganizationBox.js +++ b/server/sonar-web/src/main/js/components/common/UpgradeOrganizationBox.js @@ -32,15 +32,11 @@ type Props = { export default function UpgradeOrganizationBox(props /*: Props */) { return (
    -

    - {translate('billing.upgrade_box.header')} -

    +

    {translate('billing.upgrade_box.header')}

    -

    - {translate('billing.upgrade_box.text')} -

    +

    {translate('billing.upgrade_box.text')}

    - {hasMessage('billing.upgrade_box.button') && + {hasMessage('billing.upgrade_box.button') && (
    {translate('billing.upgrade_box.button')} -
    } +
    + )} ); } diff --git a/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx b/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx index 4e3642d03b0..4412feec4d1 100644 --- a/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx +++ b/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx @@ -54,38 +54,32 @@ export default class VisibilitySelector extends React.PureComponent { 'is-checked': this.props.visibility === 'public' })} /> - - {translate('visibility.public')} - + {translate('visibility.public')} - {this.props.canTurnToPrivate - ? - - - {translate('visibility.private')} - - - : - - - {translate('visibility.private')} - - } + {this.props.canTurnToPrivate ? ( + + + {translate('visibility.private')} + + ) : ( + + + {translate('visibility.private')} + + )} ); } diff --git a/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.js b/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.js index 817f852d023..58afbecad26 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.js +++ b/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.js @@ -42,11 +42,11 @@ it('should render correctly with children', () => { expect( shallow( - {items.map(item => + {items.map(item => ( item - )} + ))} ) ).toMatchSnapshot(); @@ -57,11 +57,11 @@ it('should correclty handle user actions', () => { const items = ['item', 'seconditem', 'third']; const list = mount( - {items.map(item => + {items.map(item => ( item - )} + ))} ); keydown(40); diff --git a/server/sonar-web/src/main/js/components/common/action-options-view.js b/server/sonar-web/src/main/js/components/common/action-options-view.js index a538e22b88e..a3ac45902ce 100644 --- a/server/sonar-web/src/main/js/components/common/action-options-view.js +++ b/server/sonar-web/src/main/js/components/common/action-options-view.js @@ -55,7 +55,9 @@ export default PopupView.extend({ makeActive(option) { if (option.length > 0) { - this.getOptions().removeClass('active').tooltip('hide'); + this.getOptions() + .removeClass('active') + .tooltip('hide'); option.addClass('active').tooltip('show'); } }, @@ -66,14 +68,22 @@ export default PopupView.extend({ selectNextOption() { this.makeActive( - this.getActiveOption().parent().nextAll('li:not(.divider)').first().children('a') + this.getActiveOption() + .parent() + .nextAll('li:not(.divider)') + .first() + .children('a') ); return false; }, selectPreviousOption() { this.makeActive( - this.getActiveOption().parent().prevAll('li:not(.divider)').first().children('a') + this.getActiveOption() + .parent() + .prevAll('li:not(.divider)') + .first() + .children('a') ); return false; }, diff --git a/server/sonar-web/src/main/js/components/common/modal-form.js b/server/sonar-web/src/main/js/components/common/modal-form.js index 2629ce5b077..0610c634f0a 100644 --- a/server/sonar-web/src/main/js/components/common/modal-form.js +++ b/server/sonar-web/src/main/js/components/common/modal-form.js @@ -38,7 +38,10 @@ export default ModalView.extend({ ModalView.prototype.onRender.apply(this, arguments); const that = this; setTimeout(() => { - that.$(':tabbable').first().focus(); + that + .$(':tabbable') + .first() + .focus(); }, 0); }, diff --git a/server/sonar-web/src/main/js/components/controls/DateInput.tsx b/server/sonar-web/src/main/js/components/controls/DateInput.tsx index 6a226b1b398..807625faa1c 100644 --- a/server/sonar-web/src/main/js/components/controls/DateInput.tsx +++ b/server/sonar-web/src/main/js/components/controls/DateInput.tsx @@ -88,10 +88,11 @@ export default class DateInput extends React.PureComponent { - {this.props.value != undefined && + {this.props.value != undefined && ( - } + + )} ); } diff --git a/server/sonar-web/src/main/js/components/controls/GlobalMessages.js b/server/sonar-web/src/main/js/components/controls/GlobalMessages.js index ac3c07535bf..3053996688b 100644 --- a/server/sonar-web/src/main/js/components/controls/GlobalMessages.js +++ b/server/sonar-web/src/main/js/components/controls/GlobalMessages.js @@ -59,10 +59,6 @@ export default class GlobalMessages extends React.PureComponent { return null; } - return ( -
    - {messages.map(this.renderMessage)} -
    - ); + return
    {messages.map(this.renderMessage)}
    ; } } diff --git a/server/sonar-web/src/main/js/components/controls/RadioToggle.tsx b/server/sonar-web/src/main/js/components/controls/RadioToggle.tsx index fd27b3752dc..bfb7c4cfee1 100644 --- a/server/sonar-web/src/main/js/components/controls/RadioToggle.tsx +++ b/server/sonar-web/src/main/js/components/controls/RadioToggle.tsx @@ -51,18 +51,12 @@ export default class RadioToggle extends React.PureComponent { onChange={this.handleChange} /> - + ); }; render() { - return ( -
      - {this.props.options.map(this.renderOption)} -
    - ); + return
      {this.props.options.map(this.renderOption)}
    ; } } diff --git a/server/sonar-web/src/main/js/components/controls/SearchSelect.js b/server/sonar-web/src/main/js/components/controls/SearchSelect.js index f8eaf43665b..84eb5253b9b 100644 --- a/server/sonar-web/src/main/js/components/controls/SearchSelect.js +++ b/server/sonar-web/src/main/js/components/controls/SearchSelect.js @@ -110,9 +110,11 @@ export default class SearchSelect extends React.PureComponent { filterOption={this.handleFilterOption} isLoading={this.state.loading} noResultsText={ - this.state.query.length < this.props.minimumQueryLength - ? translateWithParameters('select2.tooShort', this.props.minimumQueryLength) - : translate('select2.noMatches') + this.state.query.length < this.props.minimumQueryLength ? ( + translateWithParameters('select2.tooShort', this.props.minimumQueryLength) + ) : ( + translate('select2.noMatches') + ) } onBlur={this.props.resetOnBlur ? this.handleBlur : undefined} onChange={this.handleChange} diff --git a/server/sonar-web/src/main/js/components/controls/styles.css b/server/sonar-web/src/main/js/components/controls/styles.css index d54cab0df84..0917ddd28ac 100644 --- a/server/sonar-web/src/main/js/components/controls/styles.css +++ b/server/sonar-web/src/main/js/components/controls/styles.css @@ -62,7 +62,7 @@ border-radius: 22px; box-sizing: border-box; background-color: #f6f6f6; - transition: transform 0.3s cubic-bezier(.87, -.41, .19, 1.44), border 0.3s ease; + transition: transform 0.3s cubic-bezier(0.87, -0.41, 0.19, 1.44), border 0.3s ease; } .boolean-toggle-on { diff --git a/server/sonar-web/src/main/js/components/facet/FacetBox.js b/server/sonar-web/src/main/js/components/facet/FacetBox.js index bc77ac7b6f1..e77f27bb78d 100644 --- a/server/sonar-web/src/main/js/components/facet/FacetBox.js +++ b/server/sonar-web/src/main/js/components/facet/FacetBox.js @@ -27,9 +27,5 @@ type Props = {| */ export default function FacetBox(props /*: Props */) { - return ( -
    - {props.children} -
    - ); + return
    {props.children}
    ; } diff --git a/server/sonar-web/src/main/js/components/facet/FacetHeader.js b/server/sonar-web/src/main/js/components/facet/FacetHeader.js index b80cec0f7a6..7950444a2e0 100644 --- a/server/sonar-web/src/main/js/components/facet/FacetHeader.js +++ b/server/sonar-web/src/main/js/components/facet/FacetHeader.js @@ -66,15 +66,17 @@ export default class FacetHeader extends React.PureComponent { width="10" height="10" style={{ paddingTop: 3 }}> - {this.props.open - ? - : } + {this.props.open ? ( + + ) : ( + + )} ); } @@ -97,9 +99,7 @@ export default class FacetHeader extends React.PureComponent { return null; } return ( - - {this.props.values} - + {this.props.values} ); } @@ -108,26 +108,29 @@ export default class FacetHeader extends React.PureComponent { return (
    - {showClearButton && + {showClearButton && ( } + + )} - {this.props.onClick - ? - - {this.renderCheckbox()} - {this.props.name} - - {this.renderHelper()} - {this.renderValueIndicator()} - - : + {this.props.onClick ? ( + + + {this.renderCheckbox()} {this.props.name} - {this.renderHelper()} - } + + {this.renderHelper()} + {this.renderValueIndicator()} + + ) : ( + + {this.props.name} + {this.renderHelper()} + + )}
    ); } diff --git a/server/sonar-web/src/main/js/components/facet/FacetItem.js b/server/sonar-web/src/main/js/components/facet/FacetItem.js index 0c238732209..3237bf66a5d 100644 --- a/server/sonar-web/src/main/js/components/facet/FacetItem.js +++ b/server/sonar-web/src/main/js/components/facet/FacetItem.js @@ -52,24 +52,16 @@ export default class FacetItem extends React.PureComponent { 'search-navigator-facet-half': this.props.halfWidth }); - return this.props.disabled - ? - - {this.props.name} - - {this.props.stat != null && - - {this.props.stat} - } - - : - - {this.props.name} - - {this.props.stat != null && - - {this.props.stat} - } - ; + return this.props.disabled ? ( + + {this.props.name} + {this.props.stat != null && {this.props.stat}} + + ) : ( + + {this.props.name} + {this.props.stat != null && {this.props.stat}} + + ); } } diff --git a/server/sonar-web/src/main/js/components/facet/FacetItemsList.js b/server/sonar-web/src/main/js/components/facet/FacetItemsList.js index 8267eaa6582..ca431b594e1 100644 --- a/server/sonar-web/src/main/js/components/facet/FacetItemsList.js +++ b/server/sonar-web/src/main/js/components/facet/FacetItemsList.js @@ -27,9 +27,5 @@ type Props = {| */ export default function FacetItemsList(props /*: Props */) { - return ( -
    - {props.children} -
    - ); + return
    {props.children}
    ; } diff --git a/server/sonar-web/src/main/js/components/icons-components/BranchIcon.tsx b/server/sonar-web/src/main/js/components/icons-components/BranchIcon.tsx index a1b1a363b3d..62c4bf0d741 100644 --- a/server/sonar-web/src/main/js/components/icons-components/BranchIcon.tsx +++ b/server/sonar-web/src/main/js/components/icons-components/BranchIcon.tsx @@ -32,7 +32,9 @@ interface Props { } export default function BranchIcon({ branch, ...props }: Props) { - return isShortLivingBranch(branch) - ? - : ; + return isShortLivingBranch(branch) ? ( + + ) : ( + + ); } diff --git a/server/sonar-web/src/main/js/components/icons-components/QualifierIcon.js b/server/sonar-web/src/main/js/components/icons-components/QualifierIcon.js index be71c1f128a..d11732bcb90 100644 --- a/server/sonar-web/src/main/js/components/icons-components/QualifierIcon.js +++ b/server/sonar-web/src/main/js/components/icons-components/QualifierIcon.js @@ -23,57 +23,66 @@ import React from 'react'; const DEFAULT_COLOR = '#2D88C0'; const ICONS /*: Object */ = { - dir: (color = '#F90') => + dir: (color = '#F90') => ( , - trk: (color = DEFAULT_COLOR) => + /> + ), + trk: (color = DEFAULT_COLOR) => ( , - brc: (color = DEFAULT_COLOR) => + /> + ), + brc: (color = DEFAULT_COLOR) => ( - , - uts: (color = DEFAULT_COLOR) => + + ), + uts: (color = DEFAULT_COLOR) => ( - , - fil: (color = DEFAULT_COLOR) => + + ), + fil: (color = DEFAULT_COLOR) => ( - , - lib: (color = DEFAULT_COLOR) => + + ), + lib: (color = DEFAULT_COLOR) => ( , - vw: (color = DEFAULT_COLOR) => + /> + ), + vw: (color = DEFAULT_COLOR) => ( - , - svw: (color = DEFAULT_COLOR) => + + ), + svw: (color = DEFAULT_COLOR) => ( - , - dev: (color = DEFAULT_COLOR) => + + ), + dev: (color = DEFAULT_COLOR) => ( , - app: (color = '#4A9ED5') => + /> + ), + app: (color = '#4A9ED5') => ( @@ -85,6 +94,7 @@ const ICONS /*: Object */ = { + ) }; ICONS.pac = ICONS.dir; diff --git a/server/sonar-web/src/main/js/components/intl/DateTooltipFormatter.tsx b/server/sonar-web/src/main/js/components/intl/DateTooltipFormatter.tsx index 8f9aaa32191..1943512ff8c 100644 --- a/server/sonar-web/src/main/js/components/intl/DateTooltipFormatter.tsx +++ b/server/sonar-web/src/main/js/components/intl/DateTooltipFormatter.tsx @@ -33,7 +33,7 @@ export default function DateTooltipFormatter({ className, date, placement }: Pro const parsedDate = parseDate(date); return ( - {formattedDate => + {formattedDate => ( } placement={placement} @@ -41,7 +41,8 @@ export default function DateTooltipFormatter({ className, date, placement }: Pro - } + + )} ); } diff --git a/server/sonar-web/src/main/js/components/intl/TimeTooltipFormatter.tsx b/server/sonar-web/src/main/js/components/intl/TimeTooltipFormatter.tsx index 857ed31e2f9..082074da474 100644 --- a/server/sonar-web/src/main/js/components/intl/TimeTooltipFormatter.tsx +++ b/server/sonar-web/src/main/js/components/intl/TimeTooltipFormatter.tsx @@ -32,7 +32,7 @@ export default function TimeTooltipFormatter({ className, date, placement }: Pro const parsedDate = parseDate(date); return ( - {formattedTime => + {formattedTime => ( } placement={placement} @@ -40,7 +40,8 @@ export default function TimeTooltipFormatter({ className, date, placement }: Pro - } + + )} ); } diff --git a/server/sonar-web/src/main/js/components/issue/IssueView.js b/server/sonar-web/src/main/js/components/issue/IssueView.js index 5800390c44c..49de5e25b6c 100644 --- a/server/sonar-web/src/main/js/components/issue/IssueView.js +++ b/server/sonar-web/src/main/js/components/issue/IssueView.js @@ -102,29 +102,31 @@ export default class IssueView extends React.PureComponent { onChange={this.props.onChange} /> {issue.comments && - issue.comments.length > 0 && + issue.comments.length > 0 && (
    - {issue.comments.map(comment => + {issue.comments.map(comment => ( - )} -
    } + ))} + + )} - {hasCheckbox && + {hasCheckbox && ( - } + + )} ); } diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.js b/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.js index 03837602471..f36ac5d3504 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.js @@ -136,13 +136,14 @@ export default class IssueActionsBar extends React.PureComponent { togglePopup={this.props.togglePopup} /> - {issue.effort && + {issue.effort && (
  • {translateWithParameters('issue.x_effort', issue.effort)} -
    • } - {canComment && + + )} + {canComment && ( } + /> + )} diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js index 249c9ae969d..ba6e67dda76 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.js @@ -47,7 +47,7 @@ export default class IssueAssign extends React.PureComponent { const { issue } = this.props; return ( - {issue.assignee && + {issue.assignee && ( - } + + )} {issue.assignee ? issue.assigneeName : translate('unassigned')} diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js index 4c11eb707e6..e0b1a93556b 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js @@ -69,9 +69,5 @@ export default function IssueChangelogDiff(props /*: { diff: ChangelogDiff } */) } message += ` (${translateWithParameters('issue.changelog.was', oldValue)})`; } - return ( -

    - {message} -

    - ); + return

    {message}

    ; } diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js index b756e185da9..c427818c403 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.js @@ -69,9 +69,7 @@ export default class IssueCommentAction extends React.PureComponent { diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js index aa6eeb9013f..f6c73044282 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.js @@ -101,7 +101,7 @@ export default class IssueCommentLine extends React.PureComponent {
    - {comment.updatable && + {comment.updatable && ( - } - {comment.updatable && + + )} + {comment.updatable && ( - } + + )}
    ); diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js index 82aa5852ef4..97bf195fdac 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.js @@ -58,9 +58,7 @@ export default function IssueTitleBar(props /*: Props */) { formatMeasure(locationsCount) )} placement="left"> - - {locationsCount} - + {locationsCount} ); @@ -91,20 +89,24 @@ export default function IssueTitleBar(props /*: Props */) { onFail={props.onFail} /> - {issue.textRange != null && + {issue.textRange != null && (
  • L{issue.textRange.endLine} -
    • } - {locationsCount > 0 && + + )} + {locationsCount > 0 && (
  • - {onIssuesPage - ? locationsBadge - : - {locationsBadge} - } -
    • } + {onIssuesPage ? ( + locationsBadge + ) : ( + + {locationsBadge} + + )} + + )}
    • - {hasSimilarIssuesFilter && + {hasSimilarIssuesFilter && (
  • -
    • } + + )} diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js index 007163c6666..02e2bce9e13 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTitleBar-test.js @@ -66,5 +66,10 @@ it('should count all code locations', () => { secondaryLocations: [{}, {}] }; const element = shallow(); - expect(element.find('LocationIndex').children().text()).toBe('7'); + expect( + element + .find('LocationIndex') + .children() + .text() + ).toBe('7'); }); diff --git a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js index 01549d5dac7..ac9bfa546bb 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.js @@ -93,13 +93,13 @@ export default class ChangelogPopup extends React.PureComponent { - {this.state.changelogs.map((item, idx) => + {this.state.changelogs.map((item, idx) => ( - {item.userName && + {item.userName && (

    {item.userName} -

    } +

    + )} {item.diffs.map(diff => )} - )} + ))} diff --git a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js index 428efc6a6b9..aed14996166 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.js @@ -33,9 +33,7 @@ export default function CommentDeletePopup(props /*: Props */) { return (
    -
    - {translate('issue.comment.delete_confirm_message')} -
    +
    {translate('issue.comment.delete_confirm_message')}
    diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js index 074f3345ba5..9c6b6187c65 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.js @@ -145,23 +145,24 @@ export default class SetAssigneePopup extends React.PureComponent { items={map(this.state.users, 'login')} currentItem={this.state.currentUser} onSelect={this.props.onSelect}> - {this.state.users.map(user => + {this.state.users.map(user => ( - {!!user.login && + {!!user.login && ( } + /> + )} {user.name} - )} + ))}
    diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js index 033ea8e72a8..35c98b4a389 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.js @@ -48,12 +48,12 @@ export default class SetSeverityPopup extends React.PureComponent { items={SEVERITY} currentItem={this.props.issue.severity} onSelect={this.props.onSelect}> - {SEVERITY.map(severity => + {SEVERITY.map(severity => ( {translate('severity', severity)} - )} + ))} ); diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js index e3c4d466f28..9085235dea4 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.js @@ -48,12 +48,12 @@ export default class SetTypePopup extends React.PureComponent { items={TYPES} currentItem={this.props.issue.type} onSelect={this.props.onSelect}> - {TYPES.map(type => + {TYPES.map(type => ( {translate('issue.type', type)} - )} + ))} ); diff --git a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js index 4a2642f01ac..ca556766fc9 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js +++ b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.js @@ -68,9 +68,7 @@ export default class SimilarIssuesPopup extends React.PureComponent { position={this.props.popupPosition} customClass="bubble-popup-menu bubble-popup-bottom-right">
    -
    - {translate('issue.filter_similar_issues')} -
    +
    {translate('issue.filter_similar_issues')}
    @@ -88,48 +86,51 @@ export default class SimilarIssuesPopup extends React.PureComponent {     - {issue.resolution != null - ? translate('issue.resolution', issue.resolution) - : translate('unresolved')} + {issue.resolution != null ? ( + translate('issue.resolution', issue.resolution) + ) : ( + translate('unresolved') + )} - {issue.assignee != null - ? - {translate('assigned_to')} - - {issue.assigneeName} - - : translate('unassigned')} + {issue.assignee != null ? ( + + {translate('assigned_to')} + + {issue.assigneeName} + + ) : ( + translate('unassigned') + )} - - {limitComponentName(issue.ruleName)} - + {limitComponentName(issue.ruleName)} {issue.tags != null && - issue.tags.map(tag => + issue.tags.map(tag => ( {tag} - )} + ))} {issue.projectName} - {issue.subProject != null && + {issue.subProject != null && ( {issue.subProjectName} - } + + )} diff --git a/server/sonar-web/src/main/js/components/measure/Measure.js b/server/sonar-web/src/main/js/components/measure/Measure.js index 513d54e5699..c95d52f8280 100644 --- a/server/sonar-web/src/main/js/components/measure/Measure.js +++ b/server/sonar-web/src/main/js/components/measure/Measure.js @@ -43,11 +43,7 @@ export default function Measure({ className, decimals, measure } /*: Props */) { const formattedValue = isDiffMetric(metric.key) ? formatLeak(measure.leak, metric, { decimals }) : formatMeasure(measure.value, metric.type, { decimals }); - return ( - - {formattedValue != null ? formattedValue : '–'} - - ); + return {formattedValue != null ? formattedValue : '–'}; } const value = isDiffMetric(metric.key) ? measure.leak : measure.value; @@ -56,9 +52,7 @@ export default function Measure({ className, decimals, measure } /*: Props */) { if (tooltip) { return ( - - {rating} - + {rating} ); } diff --git a/server/sonar-web/src/main/js/components/nav/NavBar.css b/server/sonar-web/src/main/js/components/nav/NavBar.css index df1c0738245..e37b1188948 100644 --- a/server/sonar-web/src/main/js/components/nav/NavBar.css +++ b/server/sonar-web/src/main/js/components/nav/NavBar.css @@ -1,6 +1,6 @@ .navbar, -[class^="navbar-"], -[class*=" navbar-"] { +[class^='navbar-'], +[class*=' navbar-'] { box-sizing: border-box; } diff --git a/server/sonar-web/src/main/js/components/nav/NavBar.tsx b/server/sonar-web/src/main/js/components/nav/NavBar.tsx index 08d0e18b511..bc760ba35a0 100644 --- a/server/sonar-web/src/main/js/components/nav/NavBar.tsx +++ b/server/sonar-web/src/main/js/components/nav/NavBar.tsx @@ -31,9 +31,7 @@ export default function NavBar({ children, className, height, ...other }: Props) return ( ); diff --git a/server/sonar-web/src/main/js/components/select-list/list.js b/server/sonar-web/src/main/js/components/select-list/list.js index c752367bb8e..0651189fedd 100644 --- a/server/sonar-web/src/main/js/components/select-list/list.js +++ b/server/sonar-web/src/main/js/components/select-list/list.js @@ -35,10 +35,6 @@ export default class List extends React.PureComponent { const key = this.props.getItemKey(item); return ; }); - return ( -
      - {renderedItems} -
    - ); + return
      {renderedItems}
    ; } } diff --git a/server/sonar-web/src/main/js/components/shared/Organization.js b/server/sonar-web/src/main/js/components/shared/Organization.js index 3debbb2a878..1c3d5abf574 100644 --- a/server/sonar-web/src/main/js/components/shared/Organization.js +++ b/server/sonar-web/src/main/js/components/shared/Organization.js @@ -55,11 +55,13 @@ class Organization extends React.PureComponent { return ( - {this.props.link - ? - {organization.name} - - : organization.name} + {this.props.link ? ( + + {organization.name} + + ) : ( + organization.name + )} ); diff --git a/server/sonar-web/src/main/js/components/shared/TypeHelper.js b/server/sonar-web/src/main/js/components/shared/TypeHelper.js index e734f22a8d5..9f423a5f489 100644 --- a/server/sonar-web/src/main/js/components/shared/TypeHelper.js +++ b/server/sonar-web/src/main/js/components/shared/TypeHelper.js @@ -28,10 +28,11 @@ type Props = { }; */ -const TypeHelper = (props /*: Props */) => +const TypeHelper = (props /*: Props */) => ( {translate('issue.type', props.type)} - ; + +); export default TypeHelper; diff --git a/server/sonar-web/src/main/js/components/tags/TagsList.js b/server/sonar-web/src/main/js/components/tags/TagsList.js index 36cd65af6d4..c85ad16c00a 100644 --- a/server/sonar-web/src/main/js/components/tags/TagsList.js +++ b/server/sonar-web/src/main/js/components/tags/TagsList.js @@ -45,9 +45,7 @@ export default class TagsList extends React.PureComponent { return ( - - {tags.join(', ')} - + {tags.join(', ')} {allowUpdate && } ); diff --git a/server/sonar-web/src/main/js/components/ui/DuplicationsRating.css b/server/sonar-web/src/main/js/components/ui/DuplicationsRating.css index 77d99af4129..0cb22a681ce 100644 --- a/server/sonar-web/src/main/js/components/ui/DuplicationsRating.css +++ b/server/sonar-web/src/main/js/components/ui/DuplicationsRating.css @@ -40,7 +40,7 @@ .duplications-rating:after { border-radius: 24px; - content: ""; + content: ''; } .duplications-rating-A { diff --git a/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx b/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx index 63aae3cc815..1d54a61692a 100644 --- a/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx +++ b/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx @@ -52,9 +52,5 @@ export default function IssueTypeIcon(props: Props) { return null; } - return props.className - ? - {icon} - - : icon; + return props.className ? {icon} : icon; } diff --git a/server/sonar-web/src/main/js/components/ui/Level.tsx b/server/sonar-web/src/main/js/components/ui/Level.tsx index b5495695578..e18d1b9f0f5 100644 --- a/server/sonar-web/src/main/js/components/ui/Level.tsx +++ b/server/sonar-web/src/main/js/components/ui/Level.tsx @@ -35,9 +35,5 @@ export default function Level(props: Props) { 'level-small': props.small, 'level-muted': props.muted }); - return ( - - {formatted} - - ); + return {formatted}; } diff --git a/server/sonar-web/src/main/js/components/ui/Rating.js b/server/sonar-web/src/main/js/components/ui/Rating.js index 1f30a388d04..0ec18df9e7c 100644 --- a/server/sonar-web/src/main/js/components/ui/Rating.js +++ b/server/sonar-web/src/main/js/components/ui/Rating.js @@ -53,10 +53,6 @@ export default class Rating extends React.PureComponent { }, this.props.className ); - return ( - - {formatted} - - ); + return {formatted}; } } diff --git a/server/sonar-web/src/main/js/components/ui/SizeRating.js b/server/sonar-web/src/main/js/components/ui/SizeRating.js index c4fd00c2bb6..3518c901225 100644 --- a/server/sonar-web/src/main/js/components/ui/SizeRating.js +++ b/server/sonar-web/src/main/js/components/ui/SizeRating.js @@ -61,10 +61,6 @@ export default class SizeRating extends React.PureComponent { 'size-rating-muted': this.props.muted }); - return ( -
    - {letter} -
    - ); + return
    {letter}
    ; } } diff --git a/server/sonar-web/src/main/js/components/widgets/barchart.js b/server/sonar-web/src/main/js/components/widgets/barchart.js index dadb5788eac..ab376ca1a3d 100644 --- a/server/sonar-web/src/main/js/components/widgets/barchart.js +++ b/server/sonar-web/src/main/js/components/widgets/barchart.js @@ -132,7 +132,9 @@ $.fn.barchart = function(data) { isValueShown = d.count === maxValue; return text; }); - $(this).find('[data-toggle=tooltip]').tooltip({ container: 'body', html: true }); + $(this) + .find('[data-toggle=tooltip]') + .tooltip({ container: 'body', html: true }); } }); }; diff --git a/server/sonar-web/src/main/js/components/workspace/views/viewer-header-view.js b/server/sonar-web/src/main/js/components/workspace/views/viewer-header-view.js index 4534781a090..524cb75fc68 100644 --- a/server/sonar-web/src/main/js/components/workspace/views/viewer-header-view.js +++ b/server/sonar-web/src/main/js/components/workspace/views/viewer-header-view.js @@ -77,7 +77,9 @@ export default Marionette.ItemView.extend({ this.initialResizeHeight = $('.workspace-viewer-container').height(); const processResizing = this.processResizing.bind(this); const stopResizing = this.stopResizing.bind(this); - $('body').on('mousemove.workspace', processResizing).on('mouseup.workspace', stopResizing); + $('body') + .on('mousemove.workspace', processResizing) + .on('mouseup.workspace', stopResizing); }, processResizing(e) { @@ -88,7 +90,9 @@ export default Marionette.ItemView.extend({ }, stopResizing() { - $('body').off('mousemove.workspace').off('mouseup.workspace'); + $('body') + .off('mousemove.workspace') + .off('mouseup.workspace'); }, toFullScreen() { -- cgit v1.2.3