Changeset 9626 for trunk/wp-includes/script-loader.php

Timestamp:

11/12/2008 12:27:01 AM (18 years ago)

Author:

azaozz

Message:

Merge all JS files that always load with common.js

File:

• trunk/wp-includes/script-loader.php (modified) (11 diffs)

trunk/wp-includes/script-loader.php

@@ -42 +42 @@
         $scripts->default_version = get_bloginfo( 'version' );
 
-        $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'user-settings', 'menu'), '20081107' );
+        $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081111' );
         $scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
 
@@ -146 +146 @@
                         'how' => __('Separate multiple categories with commas.')
                 ) );
-                $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists', 'columns', 'settings-box'), '20080925' );
-                $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists', 'columns', 'settings-box'), '20080925' );
+                $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-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', 'settings-box'), '20081031' );
+                $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'columns'), '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', 'settings-box'), '20080925' );
+                $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( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
-                $scripts->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
                 $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081109' );
                 $scripts->localize( 'postbox', 'postboxL10n', array(
@@ -177 +176 @@
                         'cancel' => __('Cancel'),
                 ) );
-                $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug', 'settings-box'), '20081107' );
+                $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20081107' );
                 $scripts->localize( 'post', 'postL10n', array(
                         'tagsUsed' =>  __('Tags used on this post:'),
@@ -196 +195 @@
                         'saveDraft' => __('Save Draft')
                 ) );
-                $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'wp-lists', 'postbox', 'settings-box'), '20081107' );
+                $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'wp-lists', 'postbox'), '20081107' );
                 $scripts->localize( 'page', 'postL10n', array(
                         'cancel' => __('Cancel'),
@@ -211 +210 @@
                         'saveDraft' => __('Save Draft')
                 ) );
-                $scripts->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox', 'settings-box'), '20080925' );
+                $scripts->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox'), '20080925' );
                 $scripts->add( 'comment', '/wp-admin/js/comment.js', array('jquery'), '20081103' );
                 $scripts->localize( 'comment', 'commentL10n', array(
@@ -220 +219 @@
                 $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080709' );
                 $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20081031' );
-                $scripts->localize( 'upload', 'uploadL10n', array(
-                        'browseTitle' => attribute_escape(__('Browse your files')),
-                        'back' => __('« Back'),
-                        'directTitle' => attribute_escape(__('Direct link to file')),
-                        'edit' => __('Edit'),
-                        'thumb' => __('Thumbnail'),
-                        'full' => __('Full size'),
-                        'icon' => __('Icon'),
-                        'title' => __('Title'),
-                        'show' => __('Show:'),
-                        'link' => __('Link to:'),
-                        'file' => __('File'),
-                        'page' => __('Page'),
-                        'none' => __('None'),
-                        'editorText' => attribute_escape(__('Send to editor »')),
-                        'insert' => __('Insert'),
-                        'urlText' => __('URL'),
-                        'desc' => __('Description'),
-                        'deleteText' => attribute_escape(__('Delete File')),
-                        'saveText' => attribute_escape(__('Save »')),
-                        'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
-                ) );
+                
                 $scripts->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20081010' );
                 $scripts->localize( 'admin-widgets', 'widgetsL10n', array(
@@ -281 +259 @@
                 $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
 
-                $scripts->add( 'user-settings', '/wp-admin/js/user-settings.js', array(), '20080829' );
-
-                $scripts->add( 'posts', '/wp-admin/js/posts.js', array('columns', 'settings-box'), '20080925' );
-                $scripts->add( 'pages', '/wp-admin/js/pages.js', array('columns', 'settings-box'), '20080925' );
-                $scripts->add( 'links', '/wp-admin/js/links.js', array('columns', 'settings-box'), '20080925' );
-                $scripts->add( 'media', '/wp-admin/js/media.js', array('columns', 'settings-box'), '20080925' );
+                $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' );
@@ -293 +269 @@
                 ) );
 
-                $scripts->add( 'settings-box', '/wp-admin/js/settings-box.js', array( 'jquery' ), '20081107' );
-
-                $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox', 'settings-box' ), '20081016' );
+                $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox' ), '20081016' );
 
                 $scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20081109' );
-                $scripts->add( 'menu', '/wp-admin/js/menu.js', array( 'jquery', 'hoverIntent' ), '20081109' );
 
         }
@@ -401 +374 @@
 
         $userid = isset($current_user) ? $current_user->ID : 0;
-        wp_localize_script( 'user-settings', 'userSettings', array(
+        wp_localize_script( 'common', 'userSettings', array(
                 'url' => SITECOOKIEPATH,
                 'uid' => $userid,