diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:45:26 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:45:26 +0000 |
commit | 767c3538b9f4aa2684429a7efea8f7728034c754 (patch) | |
tree | 8cc7b4bc82bfc8e5cc2179b7a8aa7b4f9a2be193 /wp-includes/script-loader.php | |
parent | 23c0a299ada091cdeece968ad5cd3bdd20f5ef3c (diff) | |
download | wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.tar.gz wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.tar.xz wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.zip |
WP Merge to rev 4347
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@789 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/script-loader.php')
-rw-r--r-- | wp-includes/script-loader.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 6d069c6..cf790ab 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -15,15 +15,17 @@ class WP_Scripts { $this->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' ); $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' ); $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' ); - $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '09212006' ); - $this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '09212006' ); + $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '09212006a' ); + $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'), '09212006' ); $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0'); - $this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4206'); + $this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4211'); $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4187'); $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4187'); $this->add( 'scriptaculous', '/wp-includes/js/scriptaculous/scriptaculous.js', array('prototype'), '1.6.1'); $this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/scriptaculous.js?load=builder,dragdrop', array('prototype'), '1.6.1'); $this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/scriptaculous.js?load=controls', array('prototype'), '1.6.1'); + $this->add( 'cropper', '/wp-content/themes/connections/crop/cropper.js', array('scriptaculous-dragdrop'), '1'); $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '1'); if ( is_admin() ) { $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' ); @@ -33,6 +35,7 @@ class WP_Scripts { $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3847' ); $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '3684' ); $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' ); + $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), mt_rand() ); } } |