Ticket #15981: garyc40-15981.patch

wp-admin/js/edit-comments.dev.js

@@ -278 +278 @@
 
                 this.comments_listing = $('#comments-form > input[name="comment_status"]').val() || '';
                 
-                $(listTable).bind('beforeChangePage', function(){
+                $(listTable).bind('forceUpdateRow', function(){
                         commentReply.close();
                 });
         },
@@ -297 +297 @@
         },
 
         revert : function() {
-
+                listTable.is_editing(false);
+                
                 if ( $('#the-comment-list #replyrow').length < 1 )
                         return false;
 
@@ -310 +311 @@
 
         close : function() {
                 var c;
-
+                listTable.is_editing(false);
                 if ( this.cid ) {
                         c = $('#comment-' + this.cid);
 
@@ -337 +338 @@
                 var t = this, editRow, rowData, act, h, c = $('#comment-' + id);
                 t.close();
                 t.cid = id;
+                listTable.is_editing(true);
 
                 editRow = $('#replyrow');
                 rowData = $('#inline-'+id);

wp-admin/js/inline-edit-post.dev.js

@@ -78 +78 @@
                         if ( $('form#posts-filter tr.inline-editor').length > 0 )
                                 t.revert();
                 });
+                
+                $(listTable).bind('forceUpdateRow', function(){
+                        inlineEditPost.revert();
+                });
         },
 
         toggle : function(el){
@@ -88 +92 @@
         setBulk : function(){
                 var te = '', type = this.type, tax, c = true;
                 this.revert();
-
+                listTable.is_editing(true);
+                
                 $('#bulk-edit td').attr('colspan', $('.widefat:first thead th:visible').length);
                 $('table.widefat tbody').prepend( $('#bulk-edit') );
                 $('#bulk-edit').addClass('inline-editor').show();
@@ -124 +129 @@
         edit : function(id) {
                 var t = this, fields, editRow, rowData, cats, status, pageOpt, pageLevel, nextPage, pageLoop = true, nextLevel, tax;
                 t.revert();
-
+                listTable.is_editing(true);
+                
                 if ( typeof(id) == 'object' )
                         id = t.getId(id);
 
@@ -257 +263 @@
 
         revert : function(){
                 var id = $('table.widefat tr.inline-editor').attr('id');
-
+                listTable.is_editing(false);
                 if ( id ) {
                         $('table.widefat .inline-edit-save .waiting').hide();
 

wp-admin/js/list-table.dev.js

@@ -36 +36 @@
                 if ( this.loading )
                         return false;
 
-                var different = false, data = {};
+                var different = false, data = {}, order, orderby, sorted, defaultOrder;
 
                 $.each(args, function(key, val) {
-                        if ( val != $.query.GET(key) ) {
+                        if ( val != $.query.GET(key) ) { 
                                 $.query.SET(key, val);
                                 different = true;
                         }
@@ -61 +61 @@
                 });
 
                 this._callback = callback;
-
+                
                 this.fetch_list(
                         data,
                         $.proxy(this, 'handle_success'),
                         $.proxy(this, 'handle_error')
                 );
+                
+                this.confirm_editing();
 
                 return true;
         },
+        
+        confirm_editing : function() {
+                if (this.is_editing()) {
+                        this.force_update_rows = confirm(listTableL10n.warn_update_rows);
+                        if (this.force_update_rows) {
+                                $(this).trigger('forceUpdateRow');
+                                if (this.response_cache) {
+                                        this.handle_success(this.response_cache);
+                                        this.response_cache = false;
+                                }
+                                if (this.sortable_cache) {
+                                        this.sortable_cache.find('a').click();
+                                        this.sortable_cache = false;
+                                }
+                                this.force_update_rows = false;
+                        } else {
+                                this.stop_loading();
+                        }
+                }
+        },
 
         fetch_list: function(data, success_callback, error_callback) {
                 data = $.extend(data, {
@@ -86 +108 @@
                         error: error_callback
                 });
         },
+        
+        is_editing : function(val) {
+                if (typeof val == 'undefined') {
+                        return this.is_editing._i || false;
+                } else {
+                        this.is_editing._i = val;
+
+                        if (val) {
+                                this.stop_loading();
+                        }
+                }
+        },
 
         handle_success: function(response) {
                 if ( 'object' != typeof response ) {
                         this.handle_error();
                 } else {
                         this.stop_loading();
+                        
+                        if ( ! this.is_editing() || this.force_update_rows ) {
+                                $('div.updated, div.error').not('.persistent, .inline').remove();
 
-                        $('div.updated, div.error').not('.persistent, .inline').remove();
+                                this.$tbody.html(response.rows);
 
-                        this.$tbody.html(response.rows);
+                                $('.displaying-num').html(response.total_items_i18n);
+                                $('.total-pages').html(response.total_pages_i18n);
 
-                        $('.displaying-num').html(response.total_items_i18n);
-                        $('.total-pages').html(response.total_pages_i18n);
+                                this.set_total_pages(response.total_pages);
 
-                        this.set_total_pages(response.total_pages);
+                                $('.current-page').val($.query.GET('paged'));
 
-                        $('.current-page').val($.query.GET('paged'));
+                                $('th.column-cb :input').attr('checked', false);
 
-                        $('th.column-cb :input').attr('checked', false);
+                                if ( history.replaceState ) {
+                                        history.replaceState({}, '', location.pathname + $.query);
+                                }
 
-                        if ( history.replaceState ) {
-                                history.replaceState({}, '', location.pathname + $.query);
+                                if ( this._callback )
+                                        this._callback();
+                                
+                                this.response_cache = false;
+                        } else {
+                                this.response_cache = response;
                         }
-
-                        if ( this._callback )
-                                this._callback();
                 }
         },
 
@@ -192 +232 @@
                 return false;
         });
 
+        function get_initial_order($el) {
+                return $.query.load( $el.find('a').attr('href') ).get('order');
+        }
+
         // sortable columns
         $('th.sortable a, th.sorted a').click(function() {
-
-                function get_initial_order($el) {
-                        return $.query.load( $el.find('a').attr('href') ).get('order');
-                }
-
-                var $link = $(this),
-                        $th = $link.parent('th'),
-                        thIndex = $th.index(),
-                        orderby = $.query.load( $link.attr('href') ).get('orderby'),
-                        order;
-
-                // th should include both headers in thead and tfoot
-                $th = $th.closest('table').find('thead th:eq(' + thIndex + '), tfoot th:eq(' + thIndex + ')');
-
-                if ( orderby == $.query.get('orderby') ) {
-                        // changing the direction
-                        order = ( 'asc' == $.query.get('order') ) ? 'desc' : 'asc';
-                } else {
-                        // changing the parameter
-                        order = get_initial_order($th);
-
-                        var $old_th = $('th.sorted');
-                        if ( $old_th.length ) {
-                                $old_th.removeClass('sorted').addClass('sortable');
-                                $old_th.removeClass('desc').removeClass('asc').addClass(
-                                        'asc' == get_initial_order( $old_th ) ? 'desc' : 'asc'
-                                );
+                if (! listTable.is_editing()) {
+                        var $link = $(this),
+                                $th = $link.parent('th'),
+                                thIndex = $th.index(),
+                                orderby = $.query.load( $link.attr('href') ).get('orderby'),
+                                order;
+
+                        // th should include both headers in thead and tfoot
+                        $th = $th.closest('table').find('thead th:eq(' + thIndex + '), tfoot th:eq(' + thIndex + ')');
+
+                        if ( orderby == $.query.get('orderby') ) {
+                                // changing the direction
+                                order = ( 'asc' == $.query.get('order') ) ? 'desc' : 'asc';
+                        } else {
+                                // changing the parameter
+                                order = get_initial_order($th);
+
+                                var $old_th = $('th.sorted');
+                                if ( $old_th.length ) {
+                                        $old_th.removeClass('sorted').addClass('sortable');
+                                        $old_th.removeClass('desc').removeClass('asc').addClass(
+                                                'asc' == get_initial_order( $old_th ) ? 'desc' : 'asc'
+                                        );
+                                }
+
+                                $th.removeClass('sortable').addClass('sorted');
                         }
 
-                        $th.removeClass('sortable').addClass('sorted');
+                        $th.removeClass('desc').removeClass('asc').addClass(order);
+                        listTable.update_rows({'orderby' : orderby, 'order' : order}, true);
+                        listTable.sortable_cache = false;
+                } else {
+                        listTable.sortable_cache = $(this).parents('th');
+                        listTable.confirm_editing();
                 }
-
-                $th.removeClass('desc').removeClass('asc').addClass(order);
-
-                listTable.update_rows({'orderby': orderby, 'order': order}, true);
-
                 return false;
         });
 

wp-includes/script-loader.php

@@ -309 +309 @@
                 $scripts->localize( 'list-table', 'listTableL10n', array(
                         'error' => __('An error has occurred while loading the items.'),
                         'search' => __('Search results for “%s”'),
-                        'l10n_print_after' => 'try{convertEntities(listTableL10n);}catch(e){};'
+                        'l10n_print_after' => 'try{convertEntities(listTableL10n);}catch(e){};',
+                        'warn_update_rows' => __("The changes you made will be lost if you proceed. 'Cancel' to stop, 'OK' to continue."),
                 ) );
 
                 $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'list-table', 'jquery-ui-resizable', 'quicktags'), '20101223' );