From 80fb5c79cedaf52cd7d560480073c18057ab70c3 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 12 Jan 2009 13:43:17 +0000 Subject: [PATCH] Cleanup js files and prepare for concatenating, move most inline js to files git-svn-id: https://develop.svn.wordpress.org/trunk@10348 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/admin-ajax.php | 2 +- wp-admin/admin-header.php | 27 +- wp-admin/categories.php | 15 - wp-admin/edit-comments.php | 15 - wp-admin/edit-form-advanced.php | 3 +- wp-admin/edit-link-categories.php | 15 - wp-admin/edit-pages.php | 19 +- wp-admin/edit-tags.php | 15 - wp-admin/edit.php | 19 +- wp-admin/includes/media.php | 1 + wp-admin/includes/template.php | 98 ------- wp-admin/js/cat.dev.js | 2 +- wp-admin/js/categories.dev.js | 5 - wp-admin/js/categories.js | 2 +- wp-admin/js/common.dev.js | 378 ++++++++----------------- wp-admin/js/common.js | 2 +- wp-admin/js/edit-comments.dev.js | 14 +- wp-admin/js/edit-comments.js | 2 +- wp-admin/js/inline-edit-post.dev.js | 5 +- wp-admin/js/inline-edit-post.js | 2 +- wp-admin/js/media-upload.dev.js | 10 +- wp-admin/js/media-upload.js | 2 +- wp-admin/js/media.dev.js | 105 +++++++ wp-admin/js/media.js | 1 + wp-admin/js/page.dev.js | 25 +- wp-admin/js/page.js | 2 +- wp-admin/js/post.dev.js | 149 +++++----- wp-admin/js/post.js | 2 +- wp-admin/js/postbox.dev.js | 1 + wp-admin/js/postbox.js | 2 +- wp-admin/js/tags.dev.js | 1 - wp-admin/js/tags.js | 2 +- wp-admin/js/users.js | 5 - wp-admin/js/utils.dev.js | 166 +++++++++++ wp-admin/js/utils.js | 1 + wp-admin/link-manager.php | 19 +- wp-admin/upload.php | 22 +- wp-admin/user-new.php | 3 +- wp-admin/users.php | 2 - wp-admin/wp-admin.css | 5 + wp-includes/deprecated.php | 9 +- wp-includes/general-template.php | 22 +- wp-includes/js/jquery/interface.js | 24 +- wp-includes/js/jquery/ui.core.js | 2 +- wp-includes/js/jquery/ui.dialog.js | 2 +- wp-includes/js/jquery/ui.draggable.js | 2 +- wp-includes/js/jquery/ui.resizable.js | 2 +- wp-includes/js/jquery/ui.sortable.js | 2 +- wp-includes/js/jquery/ui.tabs.js | 2 +- wp-includes/js/wp-ajax-response.dev.js | 5 + wp-includes/js/wp-ajax-response.js | 2 +- wp-includes/script-loader.php | 18 +- 52 files changed, 583 insertions(+), 675 deletions(-) create mode 100644 wp-admin/js/media.dev.js create mode 100644 wp-admin/js/media.js delete mode 100644 wp-admin/js/users.js create mode 100644 wp-admin/js/utils.dev.js create mode 100644 wp-admin/js/utils.js diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index b173572033..73aacca6ea 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -912,7 +912,7 @@ case 'hidden-columns' : $hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : ''; $hidden = explode( ',', $_POST['hidden'] ); $page = isset( $_POST['page'] )? $_POST['page'] : ''; - if ( !preg_match( '/^[a-z-_]+$/', $page ) ) { + if ( !preg_match( '/^[a-z_-]+$/', $page ) ) { die(-1); } $current_user = wp_get_current_user(); diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 07d9fc3be6..fa4bb07b73 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -24,37 +24,22 @@ wp_admin_css( 'css/global' ); wp_admin_css(); wp_admin_css( 'css/colors' ); wp_admin_css( 'css/ie' ); +wp_enqueue_script('utils'); ?> - - - - diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 719af507b4..ae33a25835 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -276,9 +276,8 @@ function post_tags_meta_box($post, $box) { - +

-

diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php index 3636635cac..4878fc556d 100644 --- a/wp-admin/edit-link-categories.php +++ b/wp-admin/edit-link-categories.php @@ -224,20 +224,5 @@ if ( $page_links ) - - diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index fd817e3ad1..2d052d9f3d 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -312,20 +312,5 @@ endif; // posts; - - - + - - - - - + //','uid':'ID; ?>','time':''}; //]]> " /> - ' + catL10n.how + '') + $('#jaxcat').prepend('' + catL10n.how + ''); $('#categorychecklist').wpList( { alt: '', response: 'cat-ajax-response', confirm: myConfirm } ); } ); diff --git a/wp-admin/js/categories.dev.js b/wp-admin/js/categories.dev.js index f9a1724a4d..1431b0f2ab 100644 --- a/wp-admin/js/categories.dev.js +++ b/wp-admin/js/categories.dev.js @@ -31,9 +31,4 @@ jQuery(document).ready(function($) { else $('#the-list').wpList({ addAfter: addAfter2 }); - if ( jQuery('#link-category-search-input').size() ) { - columns.init('edit-link-categories'); - } else { - columns.init('categories'); - } }); diff --git a/wp-admin/js/categories.js b/wp-admin/js/categories.js index 484a01c394..962baa451d 100644 --- a/wp-admin/js/categories.js +++ b/wp-admin/js/categories.js @@ -1 +1 @@ -jQuery(document).ready(function(c){var b=false,e,d,a;if(document.forms.addcat.category_parent){b=document.forms.addcat.category_parent.options}e=function(h,g){var f,i;f=c(""+c("name",h).text()+"").html();i=c("cat",h).attr("id");b[b.length]=new Option(f,i);d(h,g)};d=function(f,h){var g=c(h.parsed.responses[0].data);if(g.length==1){inlineEditTax.addEvents(c(g.id))}};a=function(g,f){var i=c("cat",g).attr("id"),h;for(h=0;h"+c("name",h).text()+"").html();i=c("cat",h).attr("id");b[b.length]=new Option(f,i);d(h,g)};d=function(f,h){var g=c(h.parsed.responses[0].data);if(g.length==1){inlineEditTax.addEvents(c(g.id))}};a=function(g,f){var i=c("cat",g).attr("id"),h;for(h=0;h