Changeset 9114

Timestamp:

10/09/2008 08:27:39 PM (16 years ago)

Author:

azaozz

Message:

Use no-js reply on error in comment-reply.js, see #7635

Location:

trunk/wp-includes

Files:

• comment-template.php (modified) (1 diff)
• js/comment-reply.js (modified) (2 diffs)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/comment-template.php

@@ -911 +911 @@
         $link = '<a rel="nofollow" href="' . site_url('wp-login.php?redirect_to=' . get_permalink()) . '">' . $login_text . '</a>';
     else 
-        $link = "<a rel='nofollow' href='" . wp_specialchars( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#respond' onclick='addComment.moveForm(\"$add_below-$comment->comment_ID\", $comment->comment_ID, \"$respond_id\"); return false;'>$reply_text</a>";
+        $link = "<a rel='nofollow' href='" . wp_specialchars( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#respond' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\")'>$reply_text</a>";
 
     return $before . $link . $after;

trunk/wp-includes/js/comment-reply.js

@@ -2 +2 @@
 addComment = {
     moveForm : function(commId, parentId, respondId) {
-        var t = this, div, comm = t.I(commId), respond = t.I(respondId);
-        
+        var t = this, div, comm = t.I(commId), respond = t.I(respondId), cancel = t.I('cancel-comment-reply-link'), parent = t.I('comment_parent');
+
+        if ( ! comm || ! respond || ! cancel || ! parent )
+            return;
+
         t.respondId = respondId;
-        
+
         if ( ! t.I('wp-temp-form-div') ) {
             div = document.createElement('div');
@@ -14 +17 @@
 
         comm.parentNode.insertBefore(respond, comm.nextSibling);
-        
-        t.I('comment_parent').value = parentId;
-        
-        t.I('cancel-comment-reply-link').style.display = '';
-        t.I('cancel-comment-reply-link').onclick = function() {
+        parent.value = parentId;
+        cancel.style.display = '';
+
+        cancel.onclick = function() {
             var t = addComment, temp = t.I('wp-temp-form-div'), respond = t.I(t.respondId);
-            
+
+            if ( ! temp || ! respond )
+                return;
+
             t.I('comment_parent').value = '0';
             temp.parentNode.insertBefore(respond, temp);
             temp.parentNode.removeChild(temp);
-            t.I('cancel-comment-reply-link').style.display = 'none';
-            t.I('cancel-comment-reply-link').onclick = null;
+            this.style.display = 'none';
+            this.onclick = null;
             return false;
         }
-        t.I('comment').focus();
+
+        try { t.I('comment').focus(); }
+        catch(e) {}
+
+        return false;
     },
-    
+
     I : function(e) {
         return document.getElementById(e);

trunk/wp-includes/script-loader.php

@@ -140 +140 @@
     $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable'), '1.5.2' );
 
-    $scripts->add( 'comment-reply', '/wp-includes/js/comment-reply.js', false, '20081008');
+    $scripts->add( 'comment-reply', '/wp-includes/js/comment-reply.js', false, '20081009');
 
     if ( is_admin() ) {