fix error when checking for mentions of self, and tweak the color again

This commit is contained in:
Morgan McMillian 2017-06-28 20:20:14 -07:00
parent 149c100206
commit 62fb31b68e
2 changed files with 7 additions and 5 deletions

View file

@ -145,10 +145,12 @@ export class StreamPage {
}
// res.data[i]['reposted_by_string'] = "Reposted by: " + reposted_by_string;
}
for (var j = 0; j < res.data[i]['content']['entities']['mentions'].length; j++) {
var men = res.data[i]['content']['entities']['mentions'][j]['text'];
if (this.myUsername === men) {
res.data[i]['you_are_mentioned'] = true;
if (res.data[i].content) {
for (var j = 0; j < res.data[i]['content']['entities']['mentions'].length; j++) {
var men = res.data[i]['content']['entities']['mentions'][j]['text'];
if (this.myUsername === men) {
res.data[i]['you_are_mentioned'] = true;
}
}
}
}

View file

@ -29,7 +29,7 @@ $colors: (
danger: #f53d3d,
light: #f4f4f4,
dark: #222,
mention: #f4f4f4
mention: #fffde7
);