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

Merge branch 'MrRenter-commentEditTwoEleven'

Browse Source
This commit is contained in:
terakilobyte
2015-04-19 22:22:27 -04:00
parent 4473b6b620 8781bc3e63
commit 66bf61cfdf
5 changed files with 90 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app.js Normal file → Executable file
View File

@ -470,6 +470,11 @@ app.post(
storyController.commentOnCommentSubmit
);
app.put(
'/stories/comment/:id/edit',
storyController.commentEdit
);
app.get(
'/stories/submit',
storyController.submitNew

37
controllers/story.js Normal file → Executable file
View File

@ -441,6 +441,43 @@ exports.commentOnCommentSubmit = function(req, res, next) {
commentSave(comment, Comment, res, next);
};
exports.commentEdit = function(req, res, next) {
Comment.find({'_id': req.params.id}, function(err, cmt) {
if (err) {
return next(err);
}
cmt = cmt.pop();
if (!req.user && cmt.author.userId !== req.user._id) {
return next(new Error('Not authorized'));
}
var sanitizedBody = sanitizeHtml(req.body.body, {
allowedTags: [],
allowedAttributes: []
}).replace(/"/g, '"');
if (req.body.body !== sanitizedBody) {
req.flash('errors', {
msg: 'HTML is not allowed'
});
return res.send(true);
}
cmt.body = sanitizedBody;
cmt.commentOn = Date.now();
cmt.save(function (err) {
if (err) {
return next(err);
}
res.send(true);
});
});
};
function commentSave(comment, Context, res, next) {
comment.save(function(err, data) {
if (err) {

20
public/js/main.js
View File

@ -298,7 +298,6 @@ $(document).ready(function() {
{
data: {
associatedPost: storyId,
originalStoryLink: originalStoryLink,
body: data
}
})
@ -314,7 +313,7 @@ $(document).ready(function() {
});
var profileValidation = angular.module('profileValidation',
['ui.bootstrap', 'ngLodash']);
['ui.bootstrap']);
profileValidation.controller('profileValidationController', ['$scope', '$http',
function($scope, $http) {
$http.get('/account/api').success(function(data) {
@ -393,12 +392,12 @@ profileValidation.directive('uniqueUsername', ['$http', function($http) {
}]);
profileValidation.directive('existingUsername',
['$http', 'lodash', function($http, lodash) {
['$http', function($http) {
return {
restrict: 'A',
require: 'ngModel',
link: function (scope, element, attrs, ngModel) {
element.bind("keyup", function (event) {
element.bind('keyup', function (event) {
if (element.val().length > 0) {
ngModel.$setValidity('exists', false);
} else {
@ -406,14 +405,11 @@ profileValidation.directive('existingUsername',
ngModel.$setPristine();
}
if (element.val()) {
var debo = lodash.debounce(function() {
$http
.get('/api/checkExistingUsername/' + element.val())
.success(function (data) {
ngModel.$setValidity('exists', data);
});
}, 2000);
debo();
$http
.get('/api/checkExistingUsername/' + element.val())
.success(function (data) {
ngModel.$setValidity('exists', data);
});
}
});
}

44
views/stories/comments.jade Normal file → Executable file
View File

@ -21,7 +21,13 @@
success: function (data, textStatus, xhr) {
commentDetails = data;
var div = document.createElement('div');
var editButton = "";
// todo
if (commentDetails.author.username === DF105CFA89562196E702912B3818C6A5B46E80D262442FDF29976621E5AF0D23) {
if ((Date.now() - commentDetails.commentOn) < 600000){
editButton = "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost edit-btn' id='" + commentDetails._id + "'>Edit</a> · ";
}
}
$(div)
.html(
'<div class="media media-news">' +
@ -36,6 +42,7 @@
'<h6>' +
'<div class="clearfix comment-a-comment negative-15">' +
"<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost' id='" + commentDetails._id + "'>Reply</a> · " +
editButton +
"commented " + moment(commentDetails.commentOn).fromNow() + " by " +
"<a href='/" + commentDetails.author.username + "'>@" + commentDetails.author.username + "</a>" +
'</div>' +
@ -55,10 +62,13 @@
complete: function () {
sentinel--;
if (!sentinel) {
$('.comment-a-comment').on('click', 'a', function () {
$('.comment-a-comment').on('click', 'a', function() {
var editOrComment = 'comment';
if ($(this).hasClass("edit-btn")){
editOrComment = 'edit';
}
if (!isLoggedIn) {
console.log('not logged in');
//window.location.href = '/signin';
window.location.href = '/signin';
return;
}
$(this).unbind('click');
@ -72,7 +82,7 @@
"<div class='input-group'>" +
"<input class='form-control big-text-field field-responsive' id='comment-to-comment-textinput' type='text' maxlength='140' autofocus />" +
"<span class='input-group-btn'>" +
"<button id='submit-comment-to-comment' class='btn btn-big btn-primary btn-responsive'>Send</button>" +
"<button id='submit-comment-to-" + editOrComment + "' class='btn btn-big btn-primary btn-responsive'>Send</button>" +
"</span>" +
"</div>" +
"</div>" +
@ -109,9 +119,31 @@
});
};
// todo
var submitCommentForEditToCommentHandler = function submitCommentForEditToCommentHandler() {
$('#submit-comment-to-edit').unbind('click');
$.ajax({
type: "PUT",
url: '/stories/comment/' + commentId + '/edit',
data: {
associatedPost: commentId,
originalStoryLink: originalStoryLink,
body: $('#comment-to-comment-textinput').val()
},
dataType: "json",
success: function (msg) {
window.location.reload();
},
error: function (err){
$('#submit-comment-to-edit').bind('click', submitCommentForEditToCommentHandler);
}
});
};
$('#submit-comment-to-edit').on('click', submitCommentForEditToCommentHandler)
$('#submit-comment-to-comment').on('click', submitCommentToCommentHandler);
});//
});
}
}
})

3
views/stories/index.jade
View File

@ -4,7 +4,8 @@ block content
if (user)
script.
var isLoggedIn = true;
var B3BA669EC5C1DD70FB478221E067A7E1B686929C569F5E73561B69C8F42129B = !{JSON.stringify(user._id)}
var B3BA669EC5C1DD70FB478221E067A7E1B686929C569F5E73561B69C8F42129B = !{JSON.stringify(user._id)};
var DF105CFA89562196E702912B3818C6A5B46E80D262442FDF29976621E5AF0D23 = !{JSON.stringify(user.profile.username)};
else
script.
var isLoggedIn = false;