Changeset 34180

Timestamp:

09/15/2015 01:45:27 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Comments: When setting the colspan value for inline edit/reply, make sure it's actually a table and the value is not empty.

Merges [34179] to the 4.3 branch.

Props afercia.
See #33596.

Location:

branches/4.3

Files:

• . (modified) (1 prop)
• src/wp-admin/js/edit-comments.js (modified) (2 diffs)

branches/4.3/src/wp-admin/js/edit-comments.js

@@ -363 +363 @@
             t = this,
             c = $('#comment-' + comment_id),
-            h = c.height();
+            h = c.height(),
+            colspanVal = 0;
 
         t.close();
@@ -373 +374 @@
         act = 'edit' == action ? 'edit' : 'replyto';
         act = t.act = act + '-comment';
-
-        $( 'td', editRow ).attr( 'colspan', $( 'th:visible, td:visible', c ).length );
+        colspanVal = $( 'th:visible, td:visible', c ).length;
+
+        // Make sure it's actually a table and there's a `colspan` value to apply.
+        if ( editRow.hasClass( 'inline-edit-row' ) && 0 !== colspanVal ) {
+            $( 'td', editRow ).attr( 'colspan', colspanVal );
+        }
 
         $('#action', editRow).val(act);