Changeset 9297

Timestamp:

10/23/2008 04:34:21 PM (17 years ago)

Author:

ryan

Message:

Bring back Quick Edit links

Location:

trunk

Files:

• wp-admin/includes/template.php (modified) (6 diffs)
• 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) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/includes/template.php

@@ -124 +124 @@
         $actions = array();
         $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+        $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
         if ( $default_cat_id != $category->term_id )
             $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
@@ -292 +293 @@
         $actions = array();
         $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+        $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
         if ( $default_cat_id != $category->term_id )
             $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
@@ -607 +609 @@
                     $actions = array();
                     $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+                    $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
                     $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this tag '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
                     $action_count = count($actions);
@@ -1272 +1275 @@
             if ( current_user_can('edit_post', $post->ID) ) {
                 $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '" title="' . attribute_escape(__('Edit this post')) . '">' . __('Edit') . '</a>';
+                $actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . attribute_escape(__('Edit this post inline')) . '">' . __('Quick Edit') . '</a>';
                 $actions['delete'] = "<a class='submitdelete' title='" . attribute_escape(__('Delete this post')) . "' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
             }
@@ -1456 +1460 @@
         $actions = array();
         $actions['edit'] = '<a href="' . $edit_link . '" title="' . attribute_escape(__('Edit this page')) . '">' . __('Edit') . '</a>';
+        $actions['inline'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
         $actions['delete'] = "<a class='submitdelete' title='" . attribute_escape(__('Delete this page')) . "' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
         if ( in_array($post->post_status, array('pending', 'draft')) )
@@ -1903 +1908 @@
                     $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
                     $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
+                    $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick Edit') . '</a>';
                     if ( 'spam' != $the_comment_status )
                         $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\');return false;" class="vim-r" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';

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

@@ -110 +110 @@
         r.each(function() {
             $(this).dblclick(function(){
-                commentReply.toggle_edit(this);
+                commentReply.toggle(this);
             });
         });
     },
 
-    toggle_edit : function(el) {
-        if ( $(el).css('display') != 'none' ) {
-            var id = $(el).attr('id').substr(8);
-            if (id) this.open(id, '', 'edit');
-        }
+    toggle : function(el) {
+        if ( $(el).css('display') != 'none' )
+            $(el).find('a.vim-q').click();
     },
 
     revert : function() {
 
-        if ( $('#the-comment-list #replyrow').length > 0 ) {
-            $('#replyrow').fadeOut('fast', function(){
-                commentReply.close();
-            });
-        }
+        if ( $('#the-comment-list #replyrow').length < 1 )
+            return false;
+
+        $('#replyrow').fadeOut('fast', function(){
+            commentReply.close();
+        });
 
         return false;
@@ -148 +147 @@
     open : function(id, p, a) {
         var t = this;
-
-        if ( $('#the-comment-list #replyrow').length > 0 )
-            t.close();
-
+        t.close();
         t.o = '#comment-'+id;
 
@@ -321 +317 @@
             }
         };
-        $.table_hotkeys($('table.widefat'),['a', 'u', 's', 'd', 'r', ['e', edit_comment],
+        $.table_hotkeys($('table.widefat'),['a', 'u', 's', 'd', 'r', 'q', ['e', edit_comment],
                 ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')],
                 ['shift+d', make_bulk('delete')], ['shift+x', toggle_all],

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

@@ -27 +27 @@
         // add events
         t.rows.dblclick(function() { inlineEditPost.toggle(this); });
+        t.addEvents(t.rows);
 
         $('#bulk-title-div').after(
@@ -79 +80 @@
     },
 
+    addEvents : function(r) {
+        r.each(function() {
+            var row = $(this);
+            $('a.editinline', row).click(function() { inlineEditPost.edit(this); return false; });
+            row.attr('title', inlineEditL10n.edit);
+        });
+    },
+
     setBulk : function() {
         var te = '', c = '';
@@ -90 +99 @@
                 var id = $(this).val();
                 c = c == '' ? ' class="alternate"' : '';
-                te += '<div'+c+' id="ttle'+id+'"><a id="_'+id+'" title="'+inlineEditL10n.rem_title+'" class="ntdelbutton">X</a>'+$('#inline_'+id+' .post_title').text()+'</div>';
+                te += '<div'+c+' id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton">X</a>'+$('#inline_'+id+' .post_title').text()+'</div>';
             }
         });
@@ -200 +209 @@
                         .animate( { backgroundColor: '#CCEEBB' }, 500)
                         .animate( { backgroundColor: '#eefee7' }, 500);
+                    inlineEditPost.addEvents(row);
                 } else {
                     $('#edit-'+id+' .quick-edit-save').append('<span class="error">'+inlineEditL10n.error+'</span>');

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

@@ -21 +21 @@
         // add events
         t.rows.dblclick(function() { inlineEditTax.toggle(this); });
+        t.addEvents(t.rows);
 
         $('#doaction, #doaction2, #post-query-submit').click(function(e){
@@ -32 +33 @@
 
         $(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
+    },
+
+    addEvents : function(r) {
+        r.each(function() {
+            var row = $(this);
+            $('a.editinline', row).click(function() { inlineEditTax.edit(this); return false; });
+            row.attr('title', inlineEditL10n.edit);
+        });
     },
 
@@ -104 +113 @@
                             .animate( { backgroundColor: '#CCEEBB' }, 500)
                             .animate( { backgroundColor: '#eefee7' }, 500);
+                        inlineEditTax.addEvents(row);
                     } else
                         $('#edit-'+id+' .quick-edit-save .error').html(r).show();

trunk/wp-includes/script-loader.php

@@ -244 +244 @@
         $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' ), '20081014' );
+        $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081007' );
         $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
-            'error' => __('Error while saving the changes.'),
-            'rem_title' => __('Remove from batch edit')
-        ) );
-
-        $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081014' );
+            'edit' => __('Double-click to edit'),
+            'error' => __('Error while saving the changes.')
+        ) );
+
+        $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081007' );
         $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
+            'edit' => __('Double-click to edit'),
             'error' => __('Error while saving the changes.')
         ) );