Changeset 9726

Timestamp:

11/15/2008 09:58:51 PM (18 years ago)

Author:

azaozz

Message:

Show a space as thousands separator for comments count when setting from js, hide ajax throbber when QE returns an error, see#8227 fixes #8225

Location:

trunk

Files:

• wp-admin/js/edit-comments.js (modified) (3 diffs)
• wp-admin/js/inline-edit-post.js (modified) (4 diffs)
• wp-admin/js/inline-edit-tax.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (5 diffs)

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

@@ -18 +18 @@
                         n = n + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 );
                         if ( n < 0 ) { n = 0; }
-                        a.html( n.toString() );
                         $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
+                        n = n.toString();
+                        if ( n.length > 3 )
+                                n = n.substr(0, n.length-3)+' '+n.substr(-3);
+                        a.html(n);
                 });
         };
@@ -35 +38 @@
                         }
                         if ( n < 0 ) { n = 0; }
-                        a.html( n.toString() );
                         $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
+                        n = n.toString();
+                        if ( n.length > 3 )
+                                n = n.substr(0, n.length-3)+' '+n.substr(-3);
+                        a.html(n);
                 });
 
@@ -50 +56 @@
                         }
                         if ( n < 0 ) { n = 0; }
-                        a.html( n.toString() );
+                        n = n.toString();
+                        if ( n.length > 3 )
+                                n = n.substr(0, n.length-3)+' '+n.substr(-3);
+                        a.html(n);
                 });
 

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

@@ -12 +12 @@
                 t.rows = $('tr.iedit');
 
-                // prepare the edit row
-//              .dblclick(function() { inlineEditPost.toggle(this); })
+                // prepare the edit rows
                 qeRow.keyup(function(e) { if(e.which == 27) return inlineEditPost.revert(); });
-
-//              .dblclick(function() { inlineEditPost.revert(); })
                 bulkRow.keyup(function(e) { if (e.which == 27) return inlineEditPost.revert(); });
 
@@ -26 +23 @@
 
                 // add events
-//              t.rows.dblclick(function() { inlineEditPost.toggle(this); });
                 t.addEvents(t.rows);
 
@@ -52 +48 @@
                 $('select[name="_status"] option[value="future"]', bulkRow).remove();
 
-                $('#doaction').click(function(e){
-                        if ( $('select[name="action"]').val() == 'edit' ) {
-                                e.preventDefault();
-                                t.setBulk();
-                        } else if ( $('form#posts-filter tr.inline-editor').length > 0 ) {
-                                t.revert();
-                        }
-                });
-
-                $('#doaction2').click(function(e){
-                        if ( $('select[name="action2"]').val() == 'edit' ) {
+                $('#doaction, #doaction2').click(function(e){
+                        var n = $(this).attr('id').substr(2);
+                        if ( $('select[name="'+n+'"]').val() == 'edit' ) {
                                 e.preventDefault();
                                 t.setBulk();
@@ -206 +194 @@
                         function(r) {
                                 var row = $(inlineEditPost.what+id);
+                                $('table.widefat .inline-edit-save .waiting').hide();
 
                                 if (r) {

trunk/wp-admin/js/inline-edit-tax.js

@@ -106 +106 @@
                         function(r) {
                                 var row = $(inlineEditTax.what+id);
+                                $('table.widefat .inline-edit-save .waiting').hide();
 
                                 if (r) {

trunk/wp-includes/script-loader.php

@@ -128 +128 @@
                         'dismiss' => __('Dismiss'),
                         'crunching' => __('Crunching…'),
-                        'deleted' => __('Deleted'),
+                        'deleted' => __('Deleted')
         ) );
 
@@ -157 +157 @@
                         'strong' => __('Strong')
                 ) );
-                $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081115' );
+                $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081115b' );
                 $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
-                        'pending' => __('%i% pending'), // must look like: "# blah blah"
                         'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
-                        'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
+                        'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last'])
                 ) );
                 $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20080925' );
@@ -167 +166 @@
                 $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081109' );
                 $scripts->localize( 'postbox', 'postboxL10n', array(
-                        'requestFile' => admin_url('admin-ajax.php'),
+                        'requestFile' => admin_url('admin-ajax.php')
                 ) );
                 $scripts->add( 'slug', '/wp-admin/js/slug.js', array('jquery'), '20080208' );
@@ -173 +172 @@
                         'requestFile' => admin_url('admin-ajax.php'),
                         'save' => __('Save'),
-                        'cancel' => __('Cancel'),
+                        'cancel' => __('Cancel')
                 ) );
                 $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20081112b' );
@@ -252 +251 @@
                 $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
 
-                $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081115' );
+                $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081115b' );
                 $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
                         'error' => __('Error while saving the changes.')
                 ) );
 
-                $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081110' );
+                $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081115' );
                 $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
                         'error' => __('Error while saving the changes.')