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

comment submit time bug fixed

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-08 18:48:20 +09:00
parent f367a0310e
commit de91be44da
4 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/story.js
View File

@ -269,7 +269,8 @@ exports.commentSubmit = function(req, res, next) {
upvotes: 0,
author: data.author,
comments: [],
topLevel: true
topLevel: true,
commentOn: Date.now()
});
commentSave(comment, Story, res);
};
@ -285,7 +286,8 @@ exports.commentOnCommentSubmit = function(req, res, next) {
upvotes: 0,
author: data.author,
comments: [],
topLevel: false
topLevel: false,
commentOn: Date.now()
});
commentSave(comment, Comment, res);
};

6
models/Comment.js
View File

@ -23,9 +23,9 @@ var commentSchema = new mongoose.Schema({
type: Array,
default: []
},
toplevel: {
type: Boolean,
default: false
commentOn: {
type: Number,
default: Date.now()
}
});

19
public/css/main.less
View File

@ -175,6 +175,14 @@ ul {
margin-top: 5px;
}
.positive-10 {
margin-top: 10px;
}
.positive-15 {
margin-top: 15px;
}
.negative-45 {
margin-top: -45px;
margin-bottom: -45px;
@ -815,13 +823,14 @@ iframe.iphone {
height: 50px;
}
.comment-wrapper {
position: relative;
//.media ~ .media .media-body-wrapper:nth-child(odd) {
// background-color: #e5e5e5;
//}
.media-body-wrapper:nth-child(odd){
background-color: #e5e5e5;
}
.comment + .comment-wrapper {
left: 3%;
}
//uncomment this to see the dimensions of all elements outlined in red
//* {

49
views/stories/comments.jade
View File

@ -1,5 +1,5 @@
.text-left
div#comment-list.comment-list
div#comment-list
script(src="https://cdn.jsdelivr.net/ramda/0.10.0/ramda.min.js")
script(src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.9.0/moment.min.js")
@ -7,9 +7,9 @@
var sentinel = 0;
var renderComments = function renderComments(comments, containerSelector, level) {
var commentDetails;
var offSetClass = level ? 'col-xs-offset-' + level : '';
var rowClass = level ? 'col-xs-' + (12 - level) : 'col-xs-12';
var backgroundColorForCommentNestingLevel = level % 2 !== 0 ? '#e5e5e5' : '#e7e7e7imit T';
R.forEach(function displayComments(comment) {
$.ajax({
type: 'GET',
url: '/stories/comments/' + comment,
@ -22,32 +22,27 @@
},
success: function (data, textStatus, xhr) {
commentDetails = data;
console.log(commentDetails.commentOn);
var div = document.createElement('div');
$(div)
.html(
"<div class='comment row col-xs-12'>" +
"<div class='col-xs-1'>" +
"<img class='img-news' src=" + commentDetails.author.picture + "></img>" +
"</div>" +
"<div class='col-xs-10'>" +
"<div class='row'>" +
"<div class='col-xs-12'>" +
commentDetails.body +
"</div>" +
"</div>" +
"<div>" +
"<h6>" +
"<div class='col-xs-12 negative-15 comment-a-comment'>" +
"commented " + moment(commentDetails.commentedOn).fromNow() + " by " +
"<a href='/" + commentDetails.author.username + "'>@" + commentDetails.author.username + "</a> · " +
"<a id='" + commentDetails._id + "'>Reply</a>" +
"</div>" +
"</h6>" +
"</div>" +
"</div>" +
"</div>"
'<div class="media">' +
'<div class="media-left">' +
'<img class="media-object img-news" src="' + commentDetails.author.picture +'" alt="' + commentDetails.author.username + '">' +
'</div>' +
'<div class="media-body comment_' + commentDetails._id + '">' +
'<div class="media-body-wrapper">' +
'<p>' + commentDetails.body + '</p>' +
'<div class="clearfix comment-a-comment negative-15">' +
"commented " + moment(commentDetails.commentOn).fromNow() + " by " +
"<a href='/" + commentDetails.author.username + "'>@" + commentDetails.author.username + "</a> · " +
"<a id='" + commentDetails._id + "'>Reply</a>" +
'</div>' +
'</div>' +
'</div>' +
'</div>'
)
.addClass('comment-wrapper comment_' + commentDetails._id)
.addClass('comment-wrapper positive-10')
.appendTo($(containerSelector));
sentinel += commentDetails.comments.length;
@ -68,8 +63,8 @@
"<button class='btn btn-small btn-primary' id='submit-comment-to-comment'>Submit</button>" +
"</div>"
)
.addClass('col-xs-6 col-xs-offset-3')
.appendTo($(this).closest('.comment'));
.addClass('row')
.appendTo($(this).closest('.media-body-wrapper'));
var submitCommentToCommentHandler = function submitCommentToCommentHandler() {
$('#submit-comment-to-comment').unbind('click');
$.post('/stories/comment/' + commentId + '/comment',