Wordpress 3.3

[autoinstalls/wordpress.git] / wp-includes / js / autosave.dev.js

diff --git a/wp-includes/js/autosave.dev.js b/wp-includes/js/autosave.dev.js
index aa4181152efcac236860cc6a65ba3f936150d35c..f1b3738354e6bfb2bd40fdd15b86e01fae906e2e 100644 (file)
--- a/wp-includes/js/autosave.dev.js
+++ b/wp-includes/js/autosave.dev.js
@@ -1,4 +1,4 @@
-var autosave, autosaveLast = '', autosavePeriodical, autosaveOldMessage = '', autosaveDelayPreview = false, notSaved = true, blockSave = false, fullscreen;
+var autosave, autosaveLast = '', autosavePeriodical, autosaveOldMessage = '', autosaveDelayPreview = false, notSaved = true, blockSave = false, fullscreen, autosaveLockRelease = true;
 
 jQuery(document).ready( function($) {
        var dotabkey = true;
@@ -9,6 +9,7 @@ jQuery(document).ready( function($) {
        //Disable autosave after the form has been submitted
        $("#post").submit(function() {
                $.cancel(autosavePeriodical);
+               autosaveLockRelease = false;
        });
 
        $('input[type="submit"], a.submitdelete', '#submitpost').click(function(){
@@ -47,6 +48,27 @@ jQuery(document).ready( function($) {
                }
        };
 
+       $(window).unload( function(e) {
+               if ( ! autosaveLockRelease )
+                       return;
+
+               // unload fires (twice) on removing the Thickbox iframe. Make sure we process only the main document unload.
+               if ( e.target && e.target.nodeName != '#document' )
+                       return;
+
+               $.ajax({
+                       type: 'POST',
+                       url: ajaxurl,
+                       async: false,
+                       data: {
+                               action: 'wp-remove-post-lock',
+                               _wpnonce: $('#_wpnonce').val(),
+                               post_ID: $('#post_ID').val(),
+                               active_post_lock: $('#active_post_lock').val()
+                       }
+               });
+       } );
+
        // preview
        $('#post-preview').click(function(){
                if ( $('#auto_draft').val() == '1' && notSaved ) {
@@ -61,6 +83,17 @@ jQuery(document).ready( function($) {
        doPreview = function() {
                $('input#wp-preview').val('dopreview');
                $('form#post').attr('target', 'wp-preview').submit().attr('target', '');
+
+               /*
+                * Workaround for WebKit bug preventing a form submitting twice to the same action.
+                * https://bugs.webkit.org/show_bug.cgi?id=28633
+                */
+               if ( $.browser.safari ) {
+                       $('form#post').attr('action', function(index, value) {
+                               return value + '?t=' + new Date().getTime();
+                       });
+               }
+
                $('input#wp-preview').val('');
        }
 
@@ -99,9 +132,14 @@ function autosave_parse_response(response) {
                        sup = res.responses[0].supplemental;
                        if ( 'disable' == sup['disable_autosave'] ) {
                                autosave = function() {};
+                               autosaveLockRelease = false;
                                res = { errors: true };
                        }
 
+                       if ( sup['active-post-lock'] ) {
+                               jQuery('#active_post_lock').val( sup['active-post-lock'] );
+                       }
+
                        if ( sup['alert'] ) {
                                jQuery('#autosave-alert').remove();
                                jQuery('#titlediv').after('<div id="autosave-alert" class="error below-h2"><p>' + sup['alert'] + '</p></div>');
@@ -245,11 +283,11 @@ autosave = function() {
        }
 
        if ( fullscreen && fullscreen.settings.visible ) {
-               post_data["post_title"] = jQuery('#wp-fullscreen-title').val();
-               post_data["content"] = jQuery("#wp_mce_fullscreen").val();
+               post_data["post_title"] = jQuery('#wp-fullscreen-title').val() || '';
+               post_data["content"] = jQuery("#wp_mce_fullscreen").val() || '';
        } else {
-               post_data["post_title"] = jQuery("#title").val()
-               post_data["content"] = jQuery("#content").val();
+               post_data["post_title"] = jQuery("#title").val() || '';
+               post_data["content"] = jQuery("#content").val() || '';
        }
 
        if ( jQuery('#post_name').val() )