Issues-511: Replay placement

Author: atelomycterus

vanilla/applications/vanilla/controllers/class.discussioncontroller.php

@@ -796,7 +796,7 @@ public function deleteComment($commentID = '', $transientKey = '') {
 
             if ($comment && $discussion) {
                 $defaultTarget = discussionUrl($discussion);
-
+                $this->json('DiscussionID', $discussionID);
                 // Make sure comment is this user's or they have Delete permission.
                 if ($comment->InsertUserID != $session->UserID || !c('Vanilla.Comments.AllowSelfDelete')) {
                     $this->categoryPermission($discussion->CategoryID, 'Vanilla.Comments.Delete');
@@ -811,6 +811,12 @@ public function deleteComment($commentID = '', $transientKey = '') {
                 // Delete the comment.
                 if (!$this->CommentModel->deleteID($commentID)) {
                     $this->Form->addError('Failed to delete comment');
+                } else {
+                    // FIX: https://github.com/topcoder-platform/forums/issues/511
+                    // Allow plugins to handle it
+                    $this->EventArguments['DiscussionID'] = $discussionID;
+                    $this->EventArguments['CommentID'] = $commentID;
+                    $this->fireEvent('AfterCommentDeleted');
                 }
             } else {
                 $this->Form->addError('Invalid comment');

vanilla/applications/vanilla/controllers/class.postcontroller.php

@@ -395,10 +395,12 @@ public function discussion($categoryUrlCode = '', $announce = '') {
                         $this->EventArguments['Discussion'] = $discussion;
                         $this->fireEvent('AfterDiscussionSave');
 
+                        // FIX: https://github.com/topcoder-platform/forums/issues/511
+                        // if /discussion/{discussionID}/p{Page} is used then view mode is flat
                         if ($this->_DeliveryType == DELIVERY_TYPE_ALL) {
-                            redirectTo(discussionUrl($discussion, 1).'?new=1');
+                            redirectTo(discussionUrl($discussion).'?new=1');
                         } else {
-                            $this->setRedirectTo(discussionUrl($discussion, 1, true).'?new=1');
+                            $this->setRedirectTo(discussionUrl($discussion).'?new=1');
                         }
                     } else {
                         // If this was a draft save, notify the user about the save

vanilla/applications/vanilla/js/discussion.js

@@ -135,6 +135,7 @@ jQuery(document).ready(function($) {
                     $('div.Popup,.Overlay').remove();
 
                 var commentID = json.CommentID;
+                var parentCommentID = json.ParentCommentID;
 
                 // Assign the comment id to the form if it was defined
                 if (commentID != null && commentID != '') {
@@ -194,11 +195,19 @@ jQuery(document).ready(function($) {
                             $(json.Data).prependTo('ul.Comments,.DiscussionTable');
                             $('ul.Comments li:first').effect("highlight", {}, "slow");
                         } else {
-                            $(json.Data)
-                                .appendTo('ul.Comments,.DiscussionTable')
-                                .effect("highlight", {}, "slow")
-                                .trigger('contentLoad');
-//                     $('ul.Comments li:last,.DiscussionTable li:last').effect("highlight", {}, "slow");
+                            var viewMode = json['ReplyTo.ViewMode'];
+                            if(viewMode === 'threaded') {
+                                item = $('ul.Comments');
+                                $('ul.Comments li').remove();
+                                $(item).append(json.Data)
+                                  //.effect("highlight", {}, "slow")
+                                  .trigger('contentLoad');
+                            } else {
+                                $(json.Data)
+                                  .appendTo('ul.Comments,.DiscussionTable')
+                                  //.effect("highlight", {}, "slow")
+                                  .trigger('contentLoad');
+                            }
                         }
                     }
                     // Remove any "More" pager links (because it is typically replaced with the latest comment by this function)
@@ -367,7 +376,7 @@ jQuery(document).ready(function($) {
         confirmHeading: gdn.definition('ConfirmDeleteCommentHeading', 'Delete Comment'),
         confirmText: gdn.definition('ConfirmDeleteCommentText', 'Are you sure you want to delete this comment?'),
         followConfirm: false,
-        deliveryType: 'BOOL', // DELIVERY_TYPE_BOOL
+        deliveryType: gdn.urlQueryParam( $('a.DeleteComment').attr('href'), 'deliveryType'), //'VIEW' - threaded, 'BOOL' - flat
         afterConfirm: function(json, sender) {
             var row = $(sender).parents('li.ItemComment');
             if (json.ErrorMessage) {
@@ -378,6 +387,15 @@ jQuery(document).ready(function($) {
                     $(this).remove();
                 });
                 gdn.processTargets(json.Targets);
+
+                var viewMode = json['ReplyTo.ViewMode'];
+                if(viewMode === 'threaded') {
+                    item = $('ul.Comments');
+                    $('ul.Comments li').remove();
+                    $(item).append(json.Data);
+                      //.effect("highlight", {}, "slow");
+                }
+
                 // Let listeners know that the comment was deleted.
                 $(document).trigger('CommentDeleted');
             }

vanilla/applications/vanilla/views/discussion/helper_functions.php

@@ -114,7 +114,7 @@ function writeComment($comment, $sender, $session, $currentOffset) {
 
         // FIX: https://github.com/topcoder-platform/forums/issues/488:
         // ViewMode should be set before displaying comment
-        $viewMode = $sender->data('ViewMode');
+        $viewMode = $sender->data('ReplyTo.ViewMode');
         ?>
         <li class="<?php echo $cssClass; ?>" id="<?php echo 'Comment_'.$comment->CommentID; ?>">
             <div class="Comment">

vanilla/js/global.js

@@ -740,6 +740,14 @@ jQuery(document).ready(function($) {
         return urlFormat.replace("{Path}", path);
     };
 
+    // Get query param from url
+    gdn.urlQueryParam = function (url, name) {
+        var results = new RegExp('[\?&]' + name + '=([^&#]*)')
+          .exec(url);
+
+        return (results !== null) ? results[1] || 0 : false;
+    }
+
     // Fill in placeholders.
     if (!gdn.elementSupports('input', 'placeholder')) {
         $('input:text,textarea').not('.NoIE').each(function() {