Changeset 9678

Timestamp:

11/14/2008 08:39:39 AM (16 years ago)

Author:

markjaquith

Message:

Better handling of text for submit button on already scheduled pages/posts

Location:

trunk/wp-admin/js

Files:

• page.js (modified) (1 diff)
• post.js (modified) (1 diff)

trunk/wp-admin/js/page.js

@@ -33 +33 @@
         var originalDate = new Date( $('#hidden_aa').val(), $('#hidden_mm').val() -1, $('#hidden_jj').val(), $('#hidden_hh').val(), $('#hidden_mn').val());
         var currentDate = new Date( $('#cur_aa').val(), $('#cur_mm').val() -1, $('#cur_jj').val(), $('#cur_hh').val(), $('#cur_mn').val());
-        if ( attemptedDate > currentDate ) {
+        if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
             var publishOn = postL10n.publishOnFuture;
             $('#publish').val( postL10n.schedule );
-        } else if ( $('#original_post_status').val() != 'publish' ) {
+        } else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {
             var publishOn = postL10n.publishOn;
             $('#publish').val( postL10n.publish );

trunk/wp-admin/js/post.js

@@ -220 +220 @@
         var originalDate = new Date( $('#hidden_aa').val(), $('#hidden_mm').val() -1, $('#hidden_jj').val(), $('#hidden_hh').val(), $('#hidden_mn').val());
         var currentDate = new Date( $('#cur_aa').val(), $('#cur_mm').val() -1, $('#cur_jj').val(), $('#cur_hh').val(), $('#cur_mn').val());
-        if ( attemptedDate > currentDate ) {
+        if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
             var publishOn = postL10n.publishOnFuture;
             $('#publish').val( postL10n.schedule );
-        } else if ( $('#original_post_status').val() != 'publish' ) {
+        } else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {
             var publishOn = postL10n.publishOn;
             $('#publish').val( postL10n.publish );