gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
terakilobyte
2015-05-02 00:41:38 -04:00
parent f3c99d90a7 f17d8abf01
commit cbdba845df
28 changed files with 784 additions and 1412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/resources.js
View File

@ -432,7 +432,7 @@ module.exports = {
var urlImage = metaImage.attr('content') ? metaImage.attr('content') : '';
var metaTitle = $('title');
var description = metaDescription.attr('content') ? metaDescription.attr('content') : '';
result.title = metaTitle.text().length < 141 ? metaTitle.text() : metaTitle.text().slice(0, 137) + " ...";
result.title = metaTitle.text().length < 90 ? metaTitle.text() : metaTitle.text().slice(0, 87) + "...";
result.image = urlImage;
result.description = description;
callback(null, result);