WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Publish box: apply changes post.js to comment.js 

See [22250], [27035], [24046], [33340] and [33341].
Fixes #33063.

Built from https://develop.svn.wordpress.org/trunk@33348


git-svn-id: http://core.svn.wordpress.org/trunk@33320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ella Iseulde Van Dorpe 2015-07-21 22:09:25 +00:00
parent 23712a822f
commit d827a71c7f
4 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
wp-admin/js/comment.js
View File

@ -3,48 +3,54 @@ jQuery(document).ready( function($) {
postboxes.add_postbox_toggles('comment');
var stamp = $('#timestamp').html();
$('.edit-timestamp').click(function () {
if ($('#timestampdiv').is(':hidden')) {
$('#timestampdiv').slideDown('normal');
$('.edit-timestamp').hide();
var $timestampdiv = $('#timestampdiv'),
stamp = $('#timestamp').html();
$timestampdiv.siblings('a.edit-timestamp').click( function( event ) {
if ( $timestampdiv.is( ':hidden' ) ) {
$timestampdiv.slideDown('fast');
$('#mm').focus();
$(this).hide();
}
return false;
event.preventDefault();
});
$('.cancel-timestamp').click(function() {
$('#timestampdiv').slideUp('normal');
$timestampdiv.find('.cancel-timestamp').click( function( event ) {
$timestampdiv.slideUp('fast').siblings('a.edit-timestamp').show().focus();
$('#mm').val($('#hidden_mm').val());
$('#jj').val($('#hidden_jj').val());
$('#aa').val($('#hidden_aa').val());
$('#hh').val($('#hidden_hh').val());
$('#mn').val($('#hidden_mn').val());
$('#timestamp').html(stamp);
$('.edit-timestamp').show();
return false;
event.preventDefault();
});
$('.save-timestamp').click(function () { // crazyhorse - multiple ok cancels
$timestampdiv.find('.save-timestamp').click( function( event ) { // crazyhorse - multiple ok cancels
var aa = $('#aa').val(), mm = $('#mm').val(), jj = $('#jj').val(), hh = $('#hh').val(), mn = $('#mn').val(),
newD = new Date( aa, mm - 1, jj, hh, mn );
event.preventDefault();
if ( newD.getFullYear() != aa || (1 + newD.getMonth()) != mm || newD.getDate() != jj || newD.getMinutes() != mn ) {
$('.timestamp-wrap', '#timestampdiv').addClass('form-invalid');
return false;
$timestampdiv.find('.timestamp-wrap').addClass('form-invalid');
return;
} else {
$('.timestamp-wrap', '#timestampdiv').removeClass('form-invalid');
$timestampdiv.find('.timestamp-wrap').removeClass('form-invalid');
}
$('#timestampdiv').slideUp('normal');
$('.edit-timestamp').show();
$('#timestamp').html(
commentL10n.submittedOn + ' <b>' +
$( '#mm option[value="' + mm + '"]' ).text() + ' ' +
jj + ', ' +
aa + ' @ ' +
hh + ':' +
mn + '</b> '
commentL10n.dateFormat
.replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) )
.replace( '%2$s', parseInt( jj, 10 ) )
.replace( '%3$s', aa )
.replace( '%4$s', ( '00' + hh ).slice( -2 ) )
.replace( '%5$s', ( '00' + mn ).slice( -2 ) ) +
'</b> '
);
return false;
$timestampdiv.slideUp('fast');
$timestampdiv.siblings('a.edit-timestamp').show();
});
});

2
wp-admin/js/comment.min.js vendored
View File

@ -1 +1 @@
jQuery(document).ready(function(a){postboxes.add_postbox_toggles("comment");var b=a("#timestamp").html();a(".edit-timestamp").click(function(){return a("#timestampdiv").is(":hidden")&&(a("#timestampdiv").slideDown("normal"),a(".edit-timestamp").hide()),!1}),a(".cancel-timestamp").click(function(){return a("#timestampdiv").slideUp("normal"),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),a("#timestamp").html(b),a(".edit-timestamp").show(),!1}),a(".save-timestamp").click(function(){var b=a("#aa").val(),c=a("#mm").val(),d=a("#jj").val(),e=a("#hh").val(),f=a("#mn").val(),g=new Date(b,c-1,d,e,f);return g.getFullYear()!=b||1+g.getMonth()!=c||g.getDate()!=d||g.getMinutes()!=f?(a(".timestamp-wrap","#timestampdiv").addClass("form-invalid"),!1):(a(".timestamp-wrap","#timestampdiv").removeClass("form-invalid"),a("#timestampdiv").slideUp("normal"),a(".edit-timestamp").show(),a("#timestamp").html(commentL10n.submittedOn+" <b>"+a('#mm option[value="'+c+'"]').text()+" "+d+", "+b+" @ "+e+":"+f+"</b> "),!1)})});
jQuery(document).ready(function(a){postboxes.add_postbox_toggles("comment");var b=a("#timestampdiv"),c=a("#timestamp").html();b.siblings("a.edit-timestamp").click(function(c){b.is(":hidden")&&(b.slideDown("fast"),a("#mm").focus(),a(this).hide()),c.preventDefault()}),b.find(".cancel-timestamp").click(function(d){b.slideUp("fast").siblings("a.edit-timestamp").show().focus(),a("#mm").val(a("#hidden_mm").val()),a("#jj").val(a("#hidden_jj").val()),a("#aa").val(a("#hidden_aa").val()),a("#hh").val(a("#hidden_hh").val()),a("#mn").val(a("#hidden_mn").val()),a("#timestamp").html(c),d.preventDefault()}),b.find(".save-timestamp").click(function(c){var d=a("#aa").val(),e=a("#mm").val(),f=a("#jj").val(),g=a("#hh").val(),h=a("#mn").val(),i=new Date(d,e-1,f,g,h);return c.preventDefault(),i.getFullYear()!=d||1+i.getMonth()!=e||i.getDate()!=f||i.getMinutes()!=h?void b.find(".timestamp-wrap").addClass("form-invalid"):(b.find(".timestamp-wrap").removeClass("form-invalid"),a("#timestamp").html(commentL10n.submittedOn+" <b>"+commentL10n.dateFormat.replace("%1$s",a('option[value="'+e+'"]',"#mm").attr("data-text")).replace("%2$s",parseInt(f,10)).replace("%3$s",d).replace("%4$s",("00"+g).slice(-2)).replace("%5$s",("00"+h).slice(-2))+"</b> "),b.slideUp("fast"),void b.siblings("a.edit-timestamp").show())})});

4
wp-includes/script-loader.php
View File

@ -523,7 +523,9 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
$scripts->add_data( 'comment', 'group', 1 );
did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array(
'submittedOn' => __('Submitted on:')
'submittedOn' => __( 'Submitted on:' ),
/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' )
) );
$scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-beta3-33347';
$wp_version = '4.3-beta3-33348';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.