@@ -98,7 +98,7 @@
$created_at);
if (isset($_POST['ajax']))
- exit("{ comment_id: ".$_POST['id']." }");
+ exit("{ comment_id: ".$_POST['id'].", comment_timestamp: \"".$created_at."\" }");
if ($_POST['status'] == "spam")
Flash::notice(__("Comment updated."), "/admin/?action=manage_spam");
@@ -425,9 +425,9 @@
$post = new Post($_POST['post_id']);
if ($post->latest_comment > $_POST['last_comment']) {
$new_comments = $sql->select("comments",
- "id",
+ "id, created_at",
array("post_id" => $_POST['post_id'],
- "id >" => $_POST['last_comment'],
+ "created_at >" => $_POST['last_comment'],
"status not" => "spam",
"status != 'denied' OR (
(
@@ -440,12 +440,16 @@
"created_at ASC",
array(":visitor_id" => $visitor->id));
- error_log(print_r($new_comments, true));
$ids = array();
- while ($the_comment = $new_comments->fetchObject())
+ $last_comment = "";
+ while ($the_comment = $new_comments->fetchObject()) {
$ids[] = $the_comment->id;
+
+ if (strtotime($last_comment) < strtotime($the_comment->created_at))
+ $last_comment = $the_comment->created_at;
+ }
?>
-{ "comment_ids": [ <?php echo implode(", ", $ids); ?> ] }
+{ comment_ids: [ <?php echo implode(", ", $ids); ?> ], last_comment: "<?php echo $last_comment; ?>" }
<?php
}
break;
modules/comments/comments.php
@@ -10,7 +10,7 @@ $(function(){
<?php if ($config->auto_reload_comments and $config->enable_reload_comments): ?>
var updater = setInterval("Comment.reload()", <?php echo $config->auto_reload_comments * 1000; ?>);
<?php endif; ?>
- $("#add_comment").append($(document.createElement("input")).attr({ type: "hidden", name: "ajax", value: "true", id: "ajax" }));
+ $("#add_comment").append($(document.createElement("input")).attr({ type: "hidden", name: "ajax", value: "true", id: "ajax" }))
$("#add_comment").ajaxForm({ dataType: "json", resetForm: true, beforeSubmit: function(){
$("#add_comment").loader();
}, success: function(json){
@@ -22,7 +22,7 @@ $(function(){
var plural = (count == 1) ? "" : "s"
$(".comment_plural").text(plural)
}
- $("#last_comment").val(json.comment_id)
+ $("#last_comment").val(json.comment_timestamp)
$(data).appendTo(".comments:not(:header)").hide().fadeIn("slow")
})
}, complete: function(){
@@ -64,8 +64,8 @@ var Comment = {
var id = $(".comments:not(:header)").attr("id").replace(/comments_/, "")
if (editing == 0 && notice == 0 && $(".comments:not(:header)").children().size() < <?php echo $config->comments_per_page; ?>) {
$.ajax({ type: "post", dataType: "json", url: "<?php echo $config->chyrp_url; ?>/includes/ajax.php", data: "action=reload_comments&post_id="+id+"&last_comment="+$("#last_comment").val(), success: function(json) {
+ $("#last_comment").val(json.last_comment)
$.each(json.comment_ids, function(i, id) {
- $("#last_comment").val(id)
$.post("<?php echo $config->chyrp_url; ?>/includes/ajax.php", { action: "show_comment", comment_id: id }, function(data){
$(data).appendTo(".comments:not(:header)").hide().fadeIn("slow")
})
modules/comments/javascript.php
@@ -14,6 +14,9 @@
public function __construct($comment_id, $options = array()) {
parent::grab($this, $comment_id, $options);
+ if ($this->no_results)
+ return false;
+
$this->body_unfiltered = $this->body;
$group = ($this->user_id and !$this->user()->no_results) ? $this->user()->group() : new Group(Config::current()->guest_group) ;
@@ -110,7 +113,7 @@
$_SESSION['comments'][] = $comment->id;
if (isset($_POST['ajax']))
- exit("{ comment_id: ".$comment->id." }");
+ exit("{ comment_id: ".$comment->id.", comment_timestamp: \"".$comment->created_at."\" }");
Flash::notice(__("Comment added."), $post->url()."#comment_".$comment->id);
}
@@ -132,7 +135,7 @@
$_SESSION['comments'][] = $comment->id;
if (isset($_POST['ajax']))
- exit("{ comment_id: ".$comment->id." }");
+ exit("{ comment_id: ".$comment->id.", comment_timestamp: \"".$comment->created_at."\" }");
Flash::notice(__("Comment added."), $post->url()."#comment_".$comment->id);
}
modules/comments/model.Comment.php
3adf78dfab6e39235682694388d7913361a3a7a4
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/351a1a8fd43618ddcf5b8227c64a1217df797efd
351a1a8fd43618ddcf5b8227c64a1217df797efd
2008-09-04T14:10:04-07:00
2008-09-04T14:10:04-07:00
Refactored and fixed AJAX comment autoreloading.
61525ac31f7fb4af888fab1c305df7d06f283db2
Alex Suraci
i.am@toogeneric.com