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; // res.data[i]['reposted_by_string'] = "Reposted by: " + reposted_by_string;
} }
for (var j = 0; j < res.data[i]['content']['entities']['mentions'].length; j++) { if (res.data[i].content) {
var men = res.data[i]['content']['entities']['mentions'][j]['text']; for (var j = 0; j < res.data[i]['content']['entities']['mentions'].length; j++) {
if (this.myUsername === men) { var men = res.data[i]['content']['entities']['mentions'][j]['text'];
res.data[i]['you_are_mentioned'] = true; if (this.myUsername === men) {
res.data[i]['you_are_mentioned'] = true;
}
} }
} }
} }

View file

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