OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2776 from matrix-org/erikj/fix_null_counter 

Fix simple header counters to correctly handle zero, take two
pull/21833/head
J. Ryan Stinnett 2019-03-12 10:46:51 +00:00 committed by GitHub
parent 7eea62a22b 1a35130869
commit 0791f220fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/components/views/rooms/AuxPanel.js
View File

@ -213,35 +213,33 @@ module.exports = React.createClass({
const severity = counter.severity; const severity = counter.severity;
const stateKey = counter.stateKey; const stateKey = counter.stateKey;
if (title && value && severity) { let span = <span>{ title }: { value }</span>
let span = <span>{ title }: { value }</span>
if (link) {
span = (
<a href={link} target="_blank" rel="noopener">
{ span }
</a>
);
}
if (link) {
span = ( span = (
<span <a href={link} target="_blank" rel="noopener">
className="m_RoomView_auxPanel_stateViews_span" { span }
data-severity={severity} </a>
key={ "x-" + stateKey }
>
{span}
</span>
);
counters.push(span);
counters.push(
<span
className="m_RoomView_auxPanel_stateViews_delim"
key={"delim" + idx}
> ─ </span>
); );
} }
span = (
<span
className="m_RoomView_auxPanel_stateViews_span"
data-severity={severity}
key={ "x-" + stateKey }
>
{span}
</span>
);
counters.push(span);
counters.push(
<span
className="m_RoomView_auxPanel_stateViews_delim"
key={"delim" + idx}
> ─ </span>
);
}); });
if (counters.length > 0) { if (counters.length > 0) {