WP Merge to WP 2.2.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1005 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 8 insertions, 22 deletions

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index bc180cf..8ee90aa 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -11,11 +11,8 @@ class WP_Scripts {
 
 	function default_scripts() {
 		$this->add( 'dbx', '/wp-includes/js/dbx.js', false, '2.05' );
-		
 		$this->add( 'fat', '/wp-includes/js/fat.js', false, '1.0-RC1_3660' );
-		
 		$this->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
-		
 		$this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3958' );
 		$this->localize( 'quicktags', 'quicktagsL10n', array(
 			'quickLinks' => __('(Quick Links)'),
@@ -28,15 +25,11 @@ class WP_Scripts {
 			'enterImageURL' => __('Enter the URL of the image'),
 			'enterImageDescription' => __('Enter a description of the image')
 		) );
-		
 		$this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
-		
 		$this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20070326' );
 		$mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');
 		$this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20070225' );
-		
-		$this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.1');
-		
+		$this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0-0');
 		$this->add( 'autosave', '/wp-includes/js/autosave.js', array('prototype', 'sack'), '20070306');
 		$this->localize( 'autosave', 'autosaveL10n', array(
 			'autosaveInterval' => apply_filters('autosave_interval', '120'),
@@ -45,7 +38,6 @@ class WP_Scripts {
 			'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
 			'savingText' => __('Saving Draft...')
 		) );
-		
 		$this->add( 'wp-ajax', '/wp-includes/js/wp-ajax.js', array('prototype'), '20070306');
 		$this->localize( 'wp-ajax', 'WPAjaxL10n', array(
 			'defaultUrl' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
@@ -53,27 +45,21 @@ class WP_Scripts {
 			'strangeText' => __("Something strange happened.  Try refreshing the page."),
 			'whoaText' => __("Slow down, I'm still sending your data!")
 		) );
-		
 		$this->add( 'listman', '/wp-includes/js/list-manipulation.js', array('wp-ajax', 'fat'), '20070306' );
 		$this->localize( 'listman', 'listManL10n', array(
 			'jumpText' => __('Jump to new item'),
 			'delText' => __('Are you sure you want to delete this %thing%?')
 		) );
-		
-		$this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.7.1-b2');
-		$this->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.7.1-b2');
-		$this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.7.1-b2');
-		$this->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.7.1-b2');
-		$this->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.7.1-b2');
-		$this->add( 'scriptaculous-sound', '/wp-includes/js/scriptaculous/sound.js', array( 'scriptaculous-root' ), '1.7.1-b2' );
-		$this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.7.1-b2');
-		$this->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.7.1-b2');
-		
+		$this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.7.0');
+		$this->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.7.0');
+		$this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.7.0');
+		$this->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.7.0');
+		$this->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.7.0');
+		$this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.7.0');
+		$this->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.7.0');
 		$this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118');
-		
 		$this->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.1.2');
 		$this->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.2');
-		
 		if ( is_admin() ) {
 			global $pagenow;
 			$man = false;