Changeset 9631

Timestamp:

11/12/2008 09:35:50 AM (17 years ago)

Author:

azaozz

Message:

Consolidate six more js files

Location:

trunk

Files:

• wp-admin/categories.php (modified) (1 diff)
• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/edit-link-categories.php (modified) (1 diff)
• wp-admin/edit-pages.php (modified) (2 diffs)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/edit.php (modified) (2 diffs)
• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-admin/js/columns.js (deleted)
• wp-admin/js/common.js (modified) (2 diffs)
• wp-admin/js/forms.js (deleted)
• wp-admin/js/links.js (deleted)
• wp-admin/js/media.js (deleted)
• wp-admin/js/pages.js (deleted)
• wp-admin/js/posts.js (deleted)
• wp-admin/link-manager.php (modified) (2 diffs)
• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/upload.php (modified) (2 diffs)
• wp-admin/user-new.php (modified) (1 diff)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (4 diffs)

trunk/wp-admin/categories.php

@@ -118 +118 @@
 }
 
-wp_enqueue_script( 'admin-categories' );
-wp_enqueue_script('admin-forms');
+wp_enqueue_script('admin-categories');
 if ( current_user_can('manage_categories') )
     wp_enqueue_script('inline-edit-tax');

trunk/wp-admin/edit-comments.php

@@ -11 +11 @@
 
 $title = __('Edit Comments');
-wp_enqueue_script( 'admin-comments' );
-wp_enqueue_script( 'admin-forms' );
+wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();
 

trunk/wp-admin/edit-link-categories.php

@@ -47 +47 @@
 $title = __('Link Categories');
 
-wp_enqueue_script( 'admin-categories' );
-wp_enqueue_script('admin-forms');
+wp_enqueue_script('admin-categories');
 if ( current_user_can('manage_categories') )
     wp_enqueue_script('inline-edit-tax');

trunk/wp-admin/edit-pages.php

@@ -70 +70 @@
     $title = __('Edit Pages');
 $parent_file = 'edit.php';
-wp_enqueue_script('admin-forms');
 wp_enqueue_script('inline-edit-post');
-wp_enqueue_script('pages');
 
 $post_stati  = array(   //  array( adj, noun )
@@ -319 +317 @@
     });
 })(jQuery);
+columns.init('page');
 /* ]]> */
 </script>

trunk/wp-admin/edit-tags.php

@@ -116 +116 @@
 $can_manage = current_user_can('manage_categories');
 
-wp_enqueue_script( 'admin-tags' );
-wp_enqueue_script('admin-forms');
+wp_enqueue_script('admin-tags');
 if ( $can_manage )
     wp_enqueue_script('inline-edit-tax');

trunk/wp-admin/edit.php

@@ -70 +70 @@
     $title = __('Edit Posts');
 $parent_file = 'edit.php';
-wp_enqueue_script('admin-forms');
 wp_enqueue_script('inline-edit-post');
-wp_enqueue_script('posts');
 
 list($post_stati, $avail_post_stati) = wp_edit_posts_query();
@@ -333 +331 @@
     });
 })(jQuery);
+columns.init('post');
 /* ]]> */
 </script>

trunk/wp-admin/includes/plugin.php

@@ -569 +569 @@
 
     if ( empty($icon_url) )
-        $icon_url = 'images/menu/generic.png';
+        $icon_url = 'images/generic.png';
 
     $_wp_last_object_menu++;

trunk/wp-admin/js/common.js

@@ -180 +180 @@
                 $(this).addClass('contextual-help-open');
             }
+        });
+        return false;
+    });
+
+    // check all checkboxes
+    var lastClicked = false;
+    $( 'table.widefat tbody .check-column :checkbox' ).click( function(e) {
+        if ( 'undefined' == e.shiftKey ) { return true; }
+        if ( e.shiftKey ) {
+            if ( !lastClicked ) { return true; }
+            var checks = $( lastClicked ).parents( 'form:first' ).find( ':checkbox' );
+            var first = checks.index( lastClicked );
+            var last = checks.index( this );
+            if ( 0 < first && 0 < last && first != last ) {
+                checks.slice( first, last ).attr( 'checked', $( this ).is( ':checked' ) ? 'checked' : '' );
+            }
+        }
+        lastClicked = this;
+        return true;
+    } );
+
+    $( 'thead :checkbox, tfoot :checkbox' ).click( function() {
+        $(this).parents( 'form:first' ).find( 'tbody:visible .check-column :checkbox' ).attr( 'checked', function() {
+            return $(this).attr( 'checked' ) ? '' : 'checked';
         });
         return false;
@@ -291 +315 @@
 $(document).ready(function(){adminMenu.init();});
 
+// show/hide/save table columns
+columns = {
+    init : function(page) {
+        $('.hide-column-tog').click( function() {
+            var column = $(this).val();
+            var show = $(this).attr('checked');
+            if ( show ) {
+                $('.column-' + column).show();
+            } else {
+                $('.column-' + column).hide();
+            }
+            columns.save_manage_columns_state(page);
+        } );
+    },
+
+    save_manage_columns_state : function(page) {
+        var hidden = $('.manage-column').filter(':hidden').map(function() { return this.id; }).get().join(',');
+        $.post('admin-ajax.php', {
+            action: 'hidden-columns',
+            hidden: hidden,
+            hiddencolumnsnonce: $('#hiddencolumnsnonce').val(),
+            page: page
+        });
+    }
+}
+
 })(jQuery);
 

trunk/wp-admin/link-manager.php

@@ -34 +34 @@
      exit;
 }
-
-wp_enqueue_script('admin-forms');
-wp_enqueue_script('links');
 
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
@@ -283 +280 @@
     });
 })(jQuery);
+columns.init('link');
 /* ]]> */
 </script>

trunk/wp-admin/plugins.php

@@ -164 +164 @@
 }
 
-wp_enqueue_script('admin-forms');
 wp_enqueue_script('plugin-install');
 add_thickbox();

trunk/wp-admin/upload.php

@@ -103 +103 @@
 $title = __('Media Library');
 $parent_file = 'edit.php';
-wp_enqueue_script( 'admin-forms' );
-wp_enqueue_script('media');
 
 if ( ! isset( $_GET['paged'] ) || $_GET['paged'] < 1 )
@@ -464 +462 @@
     });
 })(jQuery);
+columns.init('media');
 /* ]]> */
 </script>

trunk/wp-admin/user-new.php

@@ -38 +38 @@
 
 wp_enqueue_script('admin-users');
-wp_enqueue_script('admin-forms');
 
 require_once ('admin-header.php');

trunk/wp-admin/users.php

@@ -185 +185 @@
 
     wp_enqueue_script('admin-users');
-    wp_enqueue_script('admin-forms');
 
     include('admin-header.php');

trunk/wp-includes/script-loader.php

@@ -146 +146 @@
             'how' => __('Separate multiple categories with commas.')
         ) );
-        $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists', 'columns'), '20080925' );
-        $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists', 'columns'), '20080925' );
+        $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20080925' );
+        $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists'), '20080925' );
         $scripts->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20070823' );
         $scripts->add( 'password-strength-meter', '/wp-admin/js/password-strength-meter.js', array('jquery'), '20081021' );
@@ -157 +157 @@
             'strong' => __('Strong')
         ) );
-        $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'columns'), '20081031' );
+        $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081031' );
         $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
             'pending' => __('%i% pending'), // must look like: "# blah blah"
@@ -163 +163 @@
             'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
         ) );
-        $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists', 'columns'), '20080925' );
-        $scripts->add( 'admin-forms', '/wp-admin/js/forms.js', array('jquery'), '20080729');
+        $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20080925' );
         $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
         $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081109' );
@@ -259 +258 @@
         $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
 
-        $scripts->add( 'posts', '/wp-admin/js/posts.js', array('columns'), '20080925' );
-        $scripts->add( 'pages', '/wp-admin/js/pages.js', array('columns'), '20080925' );
-        $scripts->add( 'links', '/wp-admin/js/links.js', array('columns'), '20080925' );
-        $scripts->add( 'media', '/wp-admin/js/media.js', array('columns'), '20080925' );
-
-        $scripts->add( 'columns', '/wp-admin/js/columns.js', false, '20080910' );
-        $scripts->localize( 'columns', 'columnsL10n', array(
-            'requestFile' => admin_url('admin-ajax.php'),
-        ) );
-
         $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox' ), '20081016' );