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

Merge branch 'mobile-news'

Browse Source 
Conflicts:
	views/challengeMap/show.jade
This commit is contained in:
Quincy Larson
2015-05-01 21:54:10 -07:00
parent ec5c542d07 f17d8abf01
commit d492afb4f5
28 changed files with 776 additions and 1458 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);

6
controllers/story.js
View File

@@ -131,13 +131,13 @@ exports.returnIndividualStory = function(req, res, next) {
msg: "404: We couldn't find a story with that name. Please double check the name."
});
return res.redirect('/stories/');
return res.redirect('/news/');
}
story = story.pop();
var dashedNameFull = story.storyLink.toLowerCase().replace(/\s/g, '-');
if (dashedNameFull !== dashedName) {
return res.redirect('../stories/' + dashedNameFull);
return res.redirect('../news/' + dashedNameFull);
}
var userVoted = false;
@@ -285,7 +285,7 @@ exports.newStory = function(req, res, next) {
});
return res.json({
alreadyPosted: true,
storyURL: '/stories/' + story.pop().storyLink
storyURL: '/news/' + story.pop().storyLink
});
}
resources.getURLTitle(url, processResponse);