Changeset 11676

Timestamp:

07/01/2009 08:12:39 AM (16 years ago)

Author:

azaozz

Message:

Use new jQuery methods when adding, editing and deleting tags with AJAX, fix warning when deleting tags, see #10239

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (4 diffs)
• wp-admin/edit-tags.php (modified) (4 diffs)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/categories.dev.js (modified) (3 diffs)
• wp-admin/js/categories.js (modified) (1 diff)
• wp-admin/js/common.dev.js (modified) (2 diffs)
• wp-admin/js/common.js (modified) (1 diff)
• wp-admin/js/inline-edit-tax.dev.js (modified) (5 diffs)
• wp-admin/js/inline-edit-tax.js (modified) (1 diff)
• wp-admin/js/tags.dev.js (modified) (1 diff)
• wp-admin/js/tags.js (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (3 diffs)

trunk/wp-admin/admin-ajax.php

@@ -214 +214 @@
     break;
 case 'delete-tag' :
-    check_ajax_referer( "delete-tag_$id" );
+    $tag_id = (int) $_POST['tag_ID'];
+    check_ajax_referer( "delete-tag_$tag_id" );
     if ( !current_user_can( 'manage_categories' ) )
         die('-1');
 
-    if ( !empty($_POST['taxonomy']) )
-        $taxonomy = $_POST['taxonomy'];
-    else
-        $taxonomy = 'post_tag';
-
-    $tag = get_term( $id, $taxonomy );
+    $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+
+    $tag = get_term( $tag_id, $taxonomy );
     if ( !$tag || is_wp_error( $tag ) )
         die('1');
 
-    if ( wp_delete_term($id, $taxonomy))
+    if ( wp_delete_term($tag_id, $taxonomy))
         die('1');
     else
@@ -528 +526 @@
         die('-1');
 
-    if ( '' === trim($_POST['name']) ) {
-        $x = new WP_Ajax_Response( array(
-            'what' => 'tag',
-            'id' => new WP_Error( 'name', __('You did not enter a tag name.') )
-        ) );
-        $x->send();
-    }
-
-    if ( !empty($_POST['taxonomy']) )
-        $taxonomy = $_POST['taxonomy'];
-    else
-        $taxonomy = 'post_tag';
-
-    $tag = wp_insert_term($_POST['name'], $taxonomy, $_POST );
-
-    if ( is_wp_error($tag) ) {
-        $x = new WP_Ajax_Response( array(
-            'what' => 'tag',
-            'id' => $tag
-        ) );
-        $x->send();
-    }
-
-    if ( !$tag || (!$tag = get_term( $tag['term_id'], $taxonomy )) )
-        die('0');
-
-    $tag_full_name = $tag->name;
-    $tag_full_name = esc_attr($tag_full_name);
-
-    $x = new WP_Ajax_Response( array(
-        'what' => 'tag',
-        'id' => $tag->term_id,
-        'position' => '-1',
-        'data' => _tag_row( $tag, '', $taxonomy ),
-        'supplemental' => array('name' => $tag_full_name, 'show-link' => sprintf(__( 'Tag <a href="#%s">%s</a> added' ), "tag-$tag->term_id", $tag_full_name))
-    ) );
-    $x->send();
+    $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+    $tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
+
+    if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
+        echo '<div class="error"><p>' . __('An error has occured. Please reload the page and try again.') . '</p></div>';
+        exit;
+    }
+
+    echo _tag_row( $tag, '', $taxonomy );
+    exit;
     break;
 case 'get-tagcloud' :
@@ -1149 +1120 @@
             break;
         case 'tag' :
-            if ( !empty($_POST['taxonomy']) )
-                $taxonomy = $_POST['taxonomy'];
-            else
-                $taxonomy = 'post_tag';
+            $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 
             $tag = get_term( $id, $taxonomy );
@@ -1163 +1131 @@
                     die( __('Tag not updated.') );
 
-                echo _tag_row($tag);
+                echo _tag_row($tag, '', $taxonomy);
             } else {
                 die( __('Tag not updated.') );

trunk/wp-admin/edit-tags.php

@@ -35 +35 @@
         wp_die(__('Cheatin’ uh?'));
 
-    $ret = wp_insert_term($_POST['name'], $taxonomy, $_POST);
+    $ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
     if ( $ret && !is_wp_error( $ret ) ) {
         wp_redirect('edit-tags.php?message=1#addtag');
@@ -156 +156 @@
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 endif; ?>
+<div id="ajax-response"></div>
 
 <form class="search-form" action="" method="get">
@@ -275 +276 @@
 <div class="form-wrap">
 <h3><?php _e('Add a New Tag'); ?></h3>
-<div id="ajax-response"></div>
-<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">
-<input type="hidden" name="action" value="addtag" />
+<form id="addtag" method="post" action="edit-tags.php" class="validate">
+<input type="hidden" name="action" value="add-tag" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-tag'); ?>
+<?php wp_nonce_field('add-tag'); ?>
 
 <div class="form-field form-required">
-    <label for="name"><?php _e('Tag name') ?></label>
-    <input name="name" id="name" type="text" value="" size="40" aria-required="true" />
+    <label for="tag-name"><?php _e('Tag name') ?></label>
+    <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
     <p><?php _e('The name is how the tag appears on your site.'); ?></p>
 </div>
@@ -299 +299 @@
 </div>
 
-<p class="submit"><input type="submit" class="button" name="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
 <?php do_action('add_tag_form'); ?>
 </form></div>

trunk/wp-admin/includes/template.php

@@ -664 +664 @@
                     $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
                     $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-                    $actions['delete'] = "<a class='delete:the-list:tag-$tag->term_id submitdelete' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "'>" . __('Delete') . "</a>";
+                    $actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "'>" . __('Delete') . "</a>";
                     $actions = apply_filters('tag_row_actions', $actions, $tag);
                     $action_count = count($actions);
@@ -731 +731 @@
     $count = 0;
     foreach( $tags as $tag )
-        $out .= _tag_row( $tag, ++$count % 2 ? ' class="iedit alternate"' : ' class="iedit"', $taxonomy );
+        $out .= _tag_row( $tag, ++$count % 2 ? ' class="alternate"' : '', $taxonomy );
 
     // filter and send to screen

trunk/wp-admin/js/categories.dev.js

@@ -1 +1 @@
 jQuery(document).ready(function($) {
-    var options = false, addAfter, addAfter2, delBefore, delAfter;
+    var options = false, addAfter, delBefore, delAfter;
     if ( document.forms['addcat'].category_parent )
         options = document.forms['addcat'].category_parent.options;
@@ -10 +10 @@
         id = $('cat', r).attr('id');
         options[options.length] = new Option(name, id);
-
-        addAfter2( r, settings );
-    }
-
-    addAfter2 = function( x, r ) {
-        var t = $(r.parsed.responses[0].data);
-        if ( t.length == 1 )
-            inlineEditTax.addEvents($(t.id));
     }
 
@@ -37 +29 @@
         $('#the-list').wpList( { addAfter: addAfter, delBefore: delBefore, delAfter: delAfter } );
     else
-        $('#the-list').wpList({ addAfter: addAfter2, delBefore: delBefore });
+        $('#the-list').wpList({ delBefore: delBefore });
 
     $('.delete a[class^="delete"]').click(function(){return false;});

trunk/wp-admin/js/categories.js

@@ -1 @@
-jQuery(document).ready(function(d){var b=false,f,e,c,a;if(document.forms.addcat.category_parent){b=document.forms.addcat.category_parent.options}f=function(i,h){var g,j;g=d("<span>"+d("name",i).text()+"</span>").html();j=d("cat",i).attr("id");b[b.length]=new Option(g,j);e(i,h)};e=function(g,i){var h=d(i.parsed.responses[0].data);if(h.length==1){inlineEditTax.addEvents(d(h.id))}};a=function(h,g){var j=d("cat",h).attr("id"),i;for(i=0;i<b.length;i++){if(j==b[i].value){b[i]=null}}};c=function(g){if("undefined"!=showNotice){return showNotice.warn()?g:false}return g};if(b){d("#the-list").wpList({addAfter:f,delBefore:c,delAfter:a})}else{d("#the-list").wpList({addAfter:e,delBefore:c})}d('.delete a[class^="delete"]').click(function(){return false})});
+jQuery(document).ready(function(d){var b=false,e,c,a;if(document.forms.addcat.category_parent){b=document.forms.addcat.category_parent.options}e=function(h,g){var f,i;f=d("<span>"+d("name",h).text()+"</span>").html();i=d("cat",h).attr("id");b[b.length]=new Option(f,i)};a=function(g,f){var i=d("cat",g).attr("id"),h;for(h=0;h<b.length;h++){if(i==b[h].value){b[h]=null}}};c=function(f){if("undefined"!=showNotice){return showNotice.warn()?f:false}return f};if(b){d("#the-list").wpList({addAfter:e,delBefore:c,delAfter:a})}else{d("#the-list").wpList({delBefore:c})}d('.delete a[class^="delete"]').click(function(){return false})});

trunk/wp-admin/js/common.dev.js

@@ -1 @@
-var showNotice, adminMenu, columns;
+var showNotice, adminMenu, columns, validateForm;
 (function($){
 // sidebar admin menu
@@ -123 +123 @@
 $(document).ready(function(){columns.init();});
 
+validateForm = function( form ) {
+    return !$( form ).find('.form-required').filter( function() { return $('input:visible', this).val() == ''; } ).addClass( 'form-invalid' ).change( function() { $(this).removeClass( 'form-invalid' ); } ).size();
+}
+
 })(jQuery);
 

trunk/wp-admin/js/common.js

@@ -1 @@
-var showNotice,adminMenu,columns;(function(a){adminMenu={init:function(){a("#adminmenu div.wp-menu-toggle").each(function(){if(a(this).siblings(".wp-submenu").length){a(this).click(function(){adminMenu.toggle(a(this).siblings(".wp-submenu"))})}else{a(this).hide()}});this.favorites();a("a.separator").click(function(){if(a("body").hasClass("folded")){adminMenu.fold(1);deleteUserSetting("mfold")}else{adminMenu.fold();setUserSetting("mfold","f")}return false});if(a("body").hasClass("folded")){this.fold()}this.restoreMenuState()},restoreMenuState:function(){a("#adminmenu li.wp-has-submenu").each(function(c,d){var b=getUserSetting("m"+c);if(a(d).hasClass("wp-has-current-submenu")){return true}if("o"==b){a(d).addClass("wp-menu-open")}else{if("c"==b){a(d).removeClass("wp-menu-open")}}})},toggle:function(b){b.slideToggle(150,function(){b.css("display","")}).parent().toggleClass("wp-menu-open");a("#adminmenu li.wp-has-submenu").each(function(d,f){var c=a(f).hasClass("wp-menu-open")?"o":"c";setUserSetting("m"+d,c)});return false},fold:function(b){if(b){a("body").removeClass("folded");a("#adminmenu li.wp-has-submenu").unbind()}else{a("body").addClass("folded");a("#adminmenu li.wp-has-submenu").hoverIntent({over:function(j){var d,c,g,k,i;d=a(this).find(".wp-submenu");c=d.parent().offset().top+d.height()+1;g=a("#wpwrap").height();k=60+c-g;i=a(window).height()+a("body").scrollTop()-15;if(i<(c-k)){k=c-i}if(k>1){d.css({marginTop:"-"+k+"px"})}else{if(d.css("marginTop")){d.css({marginTop:""})}}d.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open").css({marginTop:""})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a("#favorite-inside").width(a("#favorite-actions").width()-4);a("#favorite-toggle, #favorite-inside").bind("mouseenter",function(){a("#favorite-inside").removeClass("slideUp").addClass("slideDown");setTimeout(function(){if(a("#favorite-inside").hasClass("slideDown")){a("#favorite-inside").slideDown(100);a("#favorite-first").addClass("slide-down")}},200)});a("#favorite-toggle, #favorite-inside").bind("mouseleave",function(){a("#favorite-inside").removeClass("slideDown").addClass("slideUp");setTimeout(function(){if(a("#favorite-inside").hasClass("slideUp")){a("#favorite-inside").slideUp(100,function(){a("#favorite-first").removeClass("slide-down")})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(".hide-column-tog").click(function(){var c=a(this).val(),b=a(this).attr("checked");if(b){a(".column-"+c).show()}else{a(".column-"+c).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})}};a(document).ready(function(){columns.init()})})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||"";if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(".fade").animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300).animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300);d("div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error").addClass("below-h2");d("div.updated, div.error").not(".below-h2").insertAfter("div.wrap h2:first");d("#doaction, #doaction2").click(function(){if(d('select[name="action"]').val()=="delete"||d('select[name="action2"]').val()=="delete"){return showNotice.warn()}});d("#show-settings-link").click(function(){if(!d("#screen-options-wrap").hasClass("screen-options-open")){d("#contextual-help-link-wrap").css("visibility","hidden")}d("#screen-options-wrap").slideToggle("fast",function(){if(d(this).hasClass("screen-options-open")){d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#contextual-help-link-wrap").css("visibility","");d(this).removeClass("screen-options-open")}else{d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("screen-options-open")}});return false});d("#contextual-help-link").click(function(){if(!d("#contextual-help-wrap").hasClass("contextual-help-open")){d("#screen-options-link-wrap").css("visibility","hidden")}d("#contextual-help-wrap").slideToggle("fast",function(){if(d(this).hasClass("contextual-help-open")){d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#screen-options-link-wrap").css("visibility","");d(this).removeClass("contextual-help-open")}else{d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("contextual-help-open")}});return false});d("#contextual-help-link-wrap, #screen-options-link-wrap").show();d("table:visible tbody .check-column :checkbox").click(function(g){if("undefined"==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).parents("form:first").find(":checkbox");e=a.index(f);c=a.index(this);b=d(this).attr("checked");if(0<e&&0<c&&e!=c){a.slice(e,c).attr("checked",function(){if(d(this).parents("tr").is(":visible")){return b?"checked":""}return""})}}f=this;return true});d("thead :checkbox, tfoot :checkbox").click(function(i){var j=d(this).attr("checked"),h="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).parents("form:first").find("table tbody:visible").find(".check-column :checkbox").attr("checked",function(){if(d(this).parents("tr").is(":hidden")){return""}if(g){return d(this).attr("checked")?"":"checked"}else{if(j){return"checked"}}return""});d(this).parents("form:first").find("table thead:visible, table tfoot:visible").find(".check-column :checkbox").attr("checked",function(){if(g){return""}else{if(j){return"checked"}}return""})});d("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");d("div.default-password-nag").hide();return false})});jQuery(document).ready(function(b){var a=b(".turbo-nag");if(!a.length||("undefined"!=typeof(google)&&google.gears)){return}if("undefined"!=typeof GearsFactory){return}else{try{if(("undefined"!=typeof window.ActiveXObject&&ActiveXObject("Gears.Factory"))||("undefined"!=typeof navigator.mimeTypes&&navigator.mimeTypes["application/x-googlegears"])){return}}catch(c){}}a.show()});
+var showNotice,adminMenu,columns,validateForm;(function(a){adminMenu={init:function(){a("#adminmenu div.wp-menu-toggle").each(function(){if(a(this).siblings(".wp-submenu").length){a(this).click(function(){adminMenu.toggle(a(this).siblings(".wp-submenu"))})}else{a(this).hide()}});this.favorites();a("a.separator").click(function(){if(a("body").hasClass("folded")){adminMenu.fold(1);deleteUserSetting("mfold")}else{adminMenu.fold();setUserSetting("mfold","f")}return false});if(a("body").hasClass("folded")){this.fold()}this.restoreMenuState()},restoreMenuState:function(){a("#adminmenu li.wp-has-submenu").each(function(c,d){var b=getUserSetting("m"+c);if(a(d).hasClass("wp-has-current-submenu")){return true}if("o"==b){a(d).addClass("wp-menu-open")}else{if("c"==b){a(d).removeClass("wp-menu-open")}}})},toggle:function(b){b.slideToggle(150,function(){b.css("display","")}).parent().toggleClass("wp-menu-open");a("#adminmenu li.wp-has-submenu").each(function(d,f){var c=a(f).hasClass("wp-menu-open")?"o":"c";setUserSetting("m"+d,c)});return false},fold:function(b){if(b){a("body").removeClass("folded");a("#adminmenu li.wp-has-submenu").unbind()}else{a("body").addClass("folded");a("#adminmenu li.wp-has-submenu").hoverIntent({over:function(j){var d,c,g,k,i;d=a(this).find(".wp-submenu");c=d.parent().offset().top+d.height()+1;g=a("#wpwrap").height();k=60+c-g;i=a(window).height()+a("body").scrollTop()-15;if(i<(c-k)){k=c-i}if(k>1){d.css({marginTop:"-"+k+"px"})}else{if(d.css("marginTop")){d.css({marginTop:""})}}d.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open").css({marginTop:""})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a("#favorite-inside").width(a("#favorite-actions").width()-4);a("#favorite-toggle, #favorite-inside").bind("mouseenter",function(){a("#favorite-inside").removeClass("slideUp").addClass("slideDown");setTimeout(function(){if(a("#favorite-inside").hasClass("slideDown")){a("#favorite-inside").slideDown(100);a("#favorite-first").addClass("slide-down")}},200)});a("#favorite-toggle, #favorite-inside").bind("mouseleave",function(){a("#favorite-inside").removeClass("slideDown").addClass("slideUp");setTimeout(function(){if(a("#favorite-inside").hasClass("slideUp")){a("#favorite-inside").slideUp(100,function(){a("#favorite-first").removeClass("slide-down")})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(".hide-column-tog").click(function(){var c=a(this).val(),b=a(this).attr("checked");if(b){a(".column-"+c).show()}else{a(".column-"+c).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})}};a(document).ready(function(){columns.init()});validateForm=function(b){return !a(b).find(".form-required").filter(function(){return a("input:visible",this).val()==""}).addClass("form-invalid").change(function(){a(this).removeClass("form-invalid")}).size()}})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||"";if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(".fade").animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300).animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300);d("div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error").addClass("below-h2");d("div.updated, div.error").not(".below-h2").insertAfter("div.wrap h2:first");d("#doaction, #doaction2").click(function(){if(d('select[name="action"]').val()=="delete"||d('select[name="action2"]').val()=="delete"){return showNotice.warn()}});d("#show-settings-link").click(function(){if(!d("#screen-options-wrap").hasClass("screen-options-open")){d("#contextual-help-link-wrap").css("visibility","hidden")}d("#screen-options-wrap").slideToggle("fast",function(){if(d(this).hasClass("screen-options-open")){d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#contextual-help-link-wrap").css("visibility","");d(this).removeClass("screen-options-open")}else{d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("screen-options-open")}});return false});d("#contextual-help-link").click(function(){if(!d("#contextual-help-wrap").hasClass("contextual-help-open")){d("#screen-options-link-wrap").css("visibility","hidden")}d("#contextual-help-wrap").slideToggle("fast",function(){if(d(this).hasClass("contextual-help-open")){d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#screen-options-link-wrap").css("visibility","");d(this).removeClass("contextual-help-open")}else{d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("contextual-help-open")}});return false});d("#contextual-help-link-wrap, #screen-options-link-wrap").show();d("table:visible tbody .check-column :checkbox").click(function(g){if("undefined"==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).parents("form:first").find(":checkbox");e=a.index(f);c=a.index(this);b=d(this).attr("checked");if(0<e&&0<c&&e!=c){a.slice(e,c).attr("checked",function(){if(d(this).parents("tr").is(":visible")){return b?"checked":""}return""})}}f=this;return true});d("thead :checkbox, tfoot :checkbox").click(function(i){var j=d(this).attr("checked"),h="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).parents("form:first").find("table tbody:visible").find(".check-column :checkbox").attr("checked",function(){if(d(this).parents("tr").is(":hidden")){return""}if(g){return d(this).attr("checked")?"":"checked"}else{if(j){return"checked"}}return""});d(this).parents("form:first").find("table thead:visible, table tfoot:visible").find(".check-column :checkbox").attr("checked",function(){if(g){return""}else{if(j){return"checked"}}return""})});d("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");d("div.default-password-nag").hide();return false})});jQuery(document).ready(function(b){var a=b(".turbo-nag");if(!a.length||("undefined"!=typeof(google)&&google.gears)){return}if("undefined"!=typeof GearsFactory){return}else{try{if(("undefined"!=typeof window.ActiveXObject&&ActiveXObject("Gears.Factory"))||("undefined"!=typeof navigator.mimeTypes&&navigator.mimeTypes["application/x-googlegears"])){return}}catch(c){}}a.show()});

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

@@ -9 +9 @@
         t.what = '#'+t.type+'-';
 
-        // get all editable rows
-        t.rows = $('tr.iedit');
+        $('.editinline').live('click', function(){
+            inlineEditTax.edit(this);
+            return false;
+        });
 
         // prepare the edit row
@@ -18 +20 @@
         $('a.save', row).click(function() { return inlineEditTax.save(this); });
         $('input, select', row).keydown(function(e) { if(e.which == 13) return inlineEditTax.save(this); });
-
-        // add events
-        t.addEvents(t.rows);
 
         $('#posts-filter input[type="submit"]').click(function(e){
@@ -31 +30 @@
         var t = this;
         $(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
-    },
-
-    addEvents : function(r) {
-        r.each(function() {
-            $(this).find('a.editinline').click(function() { inlineEditTax.edit(this); return false; });
-        });
     },
 
@@ -78 +71 @@
         };
 
-        fields = $('#edit-'+id+' :input').fieldSerialize();
+        fields = $('#edit-'+id+' :input').serialize();
         params = fields + '&' + $.param(params);
 
@@ -94 +87 @@
                         $('#edit-'+id).before(r).remove();
                         row = new_id ? $('#'+new_id) : $(inlineEditTax.what+id);
-                        row.hide();
-
-                        inlineEditTax.addEvents(row);
-                        row.fadeIn();
+                        row.hide().fadeIn();
                     } else
                         $('#edit-'+id+' .inline-edit-save .error').html(r).show();

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

@@ -1 @@
-(function(a){inlineEditTax={init:function(){var b=this,c=a("#inline-edit");b.type=a("#the-list").attr("className").substr(5);b.what="#"+b.type+"-";b.rows=a("tr.iedit");c.keyup(function(d){if(d.which==27){return inlineEditTax.revert()}});a("a.cancel",c).click(function(){return inlineEditTax.revert()});a("a.save",c).click(function(){return inlineEditTax.save(this)});a("input, select",c).keydown(function(d){if(d.which==13){return inlineEditTax.save(this)}});b.addEvents(b.rows);a('#posts-filter input[type="submit"]').click(function(d){if(a("form#posts-filter tr.inline-editor").length>0){b.revert()}})},toggle:function(c){var b=this;a(b.what+b.getId(c)).css("display")=="none"?b.revert():b.edit(c)},addEvents:function(b){b.each(function(){a(this).find("a.editinline").click(function(){inlineEditTax.edit(this);return false})})},edit:function(d){var c=this,b;c.revert();if(typeof(d)=="object"){d=c.getId(d)}b=a("#inline-edit").clone(true),rowData=a("#inline_"+d);a("td",b).attr("colspan",a(".widefat:first thead th:visible").length);if(a(c.what+d).hasClass("alternate")){a(b).addClass("alternate")}a(c.what+d).hide().after(b);a(':input[name="name"]',b).val(a(".name",rowData).text());a(':input[name="slug"]',b).val(a(".slug",rowData).text());a(b).attr("id","edit-"+d).addClass("inline-editor").show();a(".ptitle",b).eq(0).focus();return false},save:function(e){var d,b,c=a('input[name="taxonomy"]').val()||"";if(typeof(e)=="object"){e=this.getId(e)}a("table.widefat .inline-edit-save .waiting").show();d={action:"inline-save-tax",tax_type:this.type,tax_ID:e,taxonomy:c};b=a("#edit-"+e+" :input").fieldSerialize();d=b+"&"+a.param(d);a.post("admin-ajax.php",d,function(g){var h,f;a("table.widefat .inline-edit-save .waiting").hide();if(g){if(-1!=g.indexOf("<tr")){a(inlineEditTax.what+e).remove();f=a(g).attr("id");a("#edit-"+e).before(g).remove();h=f?a("#"+f):a(inlineEditTax.what+e);h.hide();inlineEditTax.addEvents(h);h.fadeIn()}else{a("#edit-"+e+" .inline-edit-save .error").html(g).show()}}else{a("#edit-"+e+" .inline-edit-save .error").html(inlineEditL10n.error).show()}});return false},revert:function(){var b=a("table.widefat tr.inline-editor").attr("id");if(b){a("table.widefat .inline-edit-save .waiting").hide();a("#"+b).remove();b=b.substr(b.lastIndexOf("-")+1);a(this.what+b).show()}return false},getId:function(c){var d=c.tagName=="TR"?c.id:a(c).parents("tr").attr("id"),b=d.split("-");return b[b.length-1]}};a(document).ready(function(){inlineEditTax.init()})})(jQuery);
+(function(a){inlineEditTax={init:function(){var b=this,c=a("#inline-edit");b.type=a("#the-list").attr("className").substr(5);b.what="#"+b.type+"-";a(".editinline").live("click",function(){inlineEditTax.edit(this);return false});c.keyup(function(d){if(d.which==27){return inlineEditTax.revert()}});a("a.cancel",c).click(function(){return inlineEditTax.revert()});a("a.save",c).click(function(){return inlineEditTax.save(this)});a("input, select",c).keydown(function(d){if(d.which==13){return inlineEditTax.save(this)}});a('#posts-filter input[type="submit"]').click(function(d){if(a("form#posts-filter tr.inline-editor").length>0){b.revert()}})},toggle:function(c){var b=this;a(b.what+b.getId(c)).css("display")=="none"?b.revert():b.edit(c)},edit:function(d){var c=this,b;c.revert();if(typeof(d)=="object"){d=c.getId(d)}b=a("#inline-edit").clone(true),rowData=a("#inline_"+d);a("td",b).attr("colspan",a(".widefat:first thead th:visible").length);if(a(c.what+d).hasClass("alternate")){a(b).addClass("alternate")}a(c.what+d).hide().after(b);a(':input[name="name"]',b).val(a(".name",rowData).text());a(':input[name="slug"]',b).val(a(".slug",rowData).text());a(b).attr("id","edit-"+d).addClass("inline-editor").show();a(".ptitle",b).eq(0).focus();return false},save:function(e){var d,b,c=a('input[name="taxonomy"]').val()||"";if(typeof(e)=="object"){e=this.getId(e)}a("table.widefat .inline-edit-save .waiting").show();d={action:"inline-save-tax",tax_type:this.type,tax_ID:e,taxonomy:c};b=a("#edit-"+e+" :input").serialize();d=b+"&"+a.param(d);a.post("admin-ajax.php",d,function(g){var h,f;a("table.widefat .inline-edit-save .waiting").hide();if(g){if(-1!=g.indexOf("<tr")){a(inlineEditTax.what+e).remove();f=a(g).attr("id");a("#edit-"+e).before(g).remove();h=f?a("#"+f):a(inlineEditTax.what+e);h.hide().fadeIn()}else{a("#edit-"+e+" .inline-edit-save .error").html(g).show()}}else{a("#edit-"+e+" .inline-edit-save .error").html(inlineEditL10n.error).show()}});return false},revert:function(){var b=a("table.widefat tr.inline-editor").attr("id");if(b){a("table.widefat .inline-edit-save .waiting").hide();a("#"+b).remove();b=b.substr(b.lastIndexOf("-")+1);a(this.what+b).show()}return false},getId:function(c){var d=c.tagName=="TR"?c.id:a(c).parents("tr").attr("id"),b=d.split("-");return b[b.length-1]}};a(document).ready(function(){inlineEditTax.init()})})(jQuery);

trunk/wp-admin/js/tags.dev.js

@@ -1 +1 @@
 jQuery(document).ready(function($) {
-    var options = false, addAfter, addAfter2, delBefore, delAfter;
 
-    addAfter = function( r, settings ) {
-        var name = $("<span>" + $('name', r).text() + "</span>").html(), id = $('tag', r).attr('id');
-        options[options.length] = new Option(name, id);
-    }
+    $('.delete-tag').live('click', function(e){
+        var t = $(this), tr = t.parents('tr'), r = true, data;
+        if ( 'undefined' != showNotice )
+            r = showNotice.warn();
+        if ( r ) {
+            data = t.attr('href').replace(/[^?]*\?/, '').replace(/action=delete/, 'action=delete-tag');
+            $.post(ajaxurl, data, function(r){
+                if ( '1' == r ) {
+                    $('#ajax-response').empty();
+                    tr.fadeOut('normal', function(){ tr.remove(); });
+                } else if ( '-1' == r ) {
+                    $('#ajax-response').empty().append('<div class="error"><p>' + tagsl10n.noPerm + '</p></div>');
+                    tr.children().css('backgroundColor', '');
+                } else {
+                    $('#ajax-response').empty().append('<div class="error"><p>' + tagsl10n.broken + '</p></div>');
+                    tr.children().css('backgroundColor', '');
+                }
+            });
+            tr.children().css('backgroundColor', '#f33');
+        }
+        return false;
+    });
 
-    addAfter2 = function( x, r ) {
-        var t = $(r.parsed.responses[0].data);
-        if ( t.length == 1 )
-            inlineEditTax.addEvents($(t.id));
-    }
+    $('#submit').click(function(){
+        var form = $(this).parents('form');
 
-    delAfter = function( r, settings ) {
-        var id = $('tag', r).attr('id'), o;
-        for ( o = 0; o < options.length; o++ )
-            if ( id == options[o].value )
-                options[o] = null;
-    }
+        if ( !validateForm( form ) )
+            return false;
 
-    delBefore = function(s) {
-        s.data.taxonomy = $('input[name="taxonomy"]').val();
+        $.post(ajaxurl, $('#addtag').serialize(), function(r){
+            if ( r.indexOf('<div class="error"') === 0 ) {
+                $('#ajax-response').append(r);
+            } else {
+                $('#ajax-response').empty();
+                $('#the-list').prepend(r);
+                $('input[type="text"]:visible, textarea:visible', form).val('');
+            }
+        });
 
-        if ( 'undefined' != showNotice )
-            return showNotice.warn() ? s : false;
+        return false;
+    });
 
-        return s;
-    }
-
-    if ( options )
-        $('#the-list').wpList( { addAfter: addAfter, delBefore: delBefore, delAfter: delAfter } );
-    else
-        $('#the-list').wpList({ addAfter: addAfter2, delBefore: delBefore });
-
-    $('.delete a[class^="delete"]').click(function(){return false;});
 });

trunk/wp-admin/js/tags.js

@@ -1 @@
-jQuery(document).ready(function(d){var b=false,f,e,c,a;f=function(i,h){var g=d("<span>"+d("name",i).text()+"</span>").html(),j=d("tag",i).attr("id");b[b.length]=new Option(g,j)};e=function(g,i){var h=d(i.parsed.responses[0].data);if(h.length==1){inlineEditTax.addEvents(d(h.id))}};a=function(h,g){var j=d("tag",h).attr("id"),i;for(i=0;i<b.length;i++){if(j==b[i].value){b[i]=null}}};c=function(g){g.data.taxonomy=d('input[name="taxonomy"]').val();if("undefined"!=showNotice){return showNotice.warn()?g:false}return g};if(b){d("#the-list").wpList({addAfter:f,delBefore:c,delAfter:a})}else{d("#the-list").wpList({addAfter:e,delBefore:c})}d('.delete a[class^="delete"]').click(function(){return false})});
+jQuery(document).ready(function(a){a(".delete-tag").live("click",function(g){var b=a(this),f=b.parents("tr"),c=true,d;if("undefined"!=showNotice){c=showNotice.warn()}if(c){d=b.attr("href").replace(/[^?]*\?/,"").replace(/action=delete/,"action=delete-tag");a.post(ajaxurl,d,function(e){if("1"==e){a("#ajax-response").empty();f.fadeOut("normal",function(){f.remove()})}else{if("-1"==e){a("#ajax-response").empty().append('<div class="error"><p>'+tagsl10n.noPerm+"</p></div>");f.children().css("backgroundColor","")}else{a("#ajax-response").empty().append('<div class="error"><p>'+tagsl10n.broken+"</p></div>");f.children().css("backgroundColor","")}}});f.children().css("backgroundColor","#f33")}return false});a("#submit").click(function(){var b=a(this).parents("form");if(!validateForm(b)){return false}a.post(ajaxurl,a("#addtag").serialize(),function(c){if(c.indexOf('<div class="error"')===0){a("#ajax-response").append(c)}else{a("#ajax-response").empty();a("#the-list").prepend(c);a('input[type="text"]:visible, textarea:visible',b).val("")}});return false})});

trunk/wp-admin/wp-admin.css

@@ -386 +386 @@
     text-decoration: none;
     font-size: 11px !important;
-    line-height: 16px;
+    line-height: 14px;
     padding: 2px 8px;
     cursor: pointer;
@@ -404 +404 @@
 a.button-primary,
 a.button-secondary {
-    line-height: 1.2em;
-    -webkit-border-radius: 10px;
-    padding: 4px 10px;
+    line-height: 15px;
+    padding: 3px 10px;
     white-space: nowrap;
 }
@@ -2417 +2416 @@
 .inline-edit-save img.waiting,
 #commentstatusdiv img.waiting {
-    padding: 0 10px;
+    padding: 2px 10px 0;
     vertical-align: top;
 }

trunk/wp-includes/script-loader.php

@@ -61 +61 @@
     $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20090102' );
 
-    $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090609' );
+    $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090623' );
     $scripts->add_data( 'common', 'group', 1 );
     $scripts->localize( 'common', 'commonL10n', array(
@@ -217 +217 @@
         ) );
 
-        $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), '20090207' );
+        $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), '20090623' );
         $scripts->add_data( 'admin-categories', 'group', 1 );
 
-        $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('wp-lists'), '20090211' );
+        $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery'), '20090623' );
         $scripts->add_data( 'admin-tags', 'group', 1 );
+        $scripts->localize( 'admin-tags', 'tagsl10n', array(
+            'noPerm' => __('You do not have permission to do that.'),
+            'broken' => __('An unidentified error has occurred.'),
+            'l10n_print_after' => 'try{convertEntities(tagsl10n);}catch(e){};'
+        ));
 
         $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20090106' );
@@ -362 +367 @@
         ) );
 
-        $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery-form' ), '20090211' );
+        $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20090623' );
         $scripts->add_data( 'inline-edit-tax', 'group', 1 );
         $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(