~canonical-sysadmins/wordpress/4.6

« back to all changes in this revision

Viewing changes to wp-admin/js/edit-comments.js

  • Committer: Ryan Finnie
  • Date: 2015-08-31 16:09:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: ryan.finnie@canonical.com-20150831160947-1h6rfxby9z1ec62u
Merge WP4.3 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
313
313
        },
314
314
 
315
315
        toggle : function(el) {
316
 
                if ( $(el).css('display') != 'none' )
317
 
                        $(el).find('a.vim-q').click();
 
316
                if ( 'none' !== $( el ).css( 'display' ) && ( $( '#replyrow' ).parent().is('#com-reply') || window.confirm( adminCommentsL10n.warnQuickEdit ) ) ) {
 
317
                        $( el ).find( 'a.vim-q' ).click();
 
318
                }
318
319
        },
319
320
 
320
321
        revert : function() {
397
398
                        });
398
399
                } else if ( action == 'add' ) {
399
400
                        $('#addhead, #addbtn', editRow).show();
400
 
                        $('#replyhead, #replybtn, #edithead, #editbtn', editRow).hide();
 
401
                        $('#replyhead, #replybtn, #edithead, #savebtn', editRow).hide();
401
402
                        $('#the-comment-list').prepend(editRow);
402
403
                        $('#replyrow').fadeIn(300);
403
404
                } else {