Index: modules/system/system-clean-url.js
===================================================================
RCS file: modules/system/system-clean-url.js
diff -N modules/system/system-clean-url.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/system/system-clean-url.js	16 Jun 2009 04:27:20 -0000
@@ -0,0 +1,55 @@
+// $Id$
+(function ($) {
+
+/**
+ * Internal function to check using Ajax if clean URLs can be enabled on the
+ * settings page.
+ *
+ * This function is not used to verify whether or not clean URLs
+ * are currently enabled.
+ */
+Drupal.behaviors.cleanURLsSettingsCheck = {
+  attach: function (context, settings) {
+    // This behavior attaches by ID, so is only valid once on a page.
+    // Also skip if we are on an install page, as Drupal.cleanURLsInstallCheck will handle
+    // the processing.
+    if ($('.clean-url-processed, #edit-clean-url.install').size()) {
+      return;
+    }
+    var url = settings.basePath + 'admin/settings/clean-urls/check';
+    $.ajax({
+      url: location.protocol + '//' + location.host + url,
+      dataType: 'json',
+      success: function () {
+        // Check was successful. Redirect using a "clean URL". This will force the form that allows enabling clean URLs.
+        location = settings.basePath +"admin/settings/clean-urls";
+      }
+    });
+    $('#clean-url').addClass('clean-url-processed');
+  }
+};
+
+/**
+ * Internal function to check using Ajax if clean URLs can be enabled on the
+ * install page.
+ *
+ * This function is not used to verify whether or not clean URLs
+ * are currently enabled.
+ */
+Drupal.cleanURLsInstallCheck = function () {
+  var url = location.protocol + '//' + location.host + Drupal.settings.basePath + 'admin/settings/clean-urls/check';
+  // Submit a synchronous request to avoid database errors associated with
+  // concurrent requests during install.
+  $.ajax({
+    async: false,
+    url: url,
+    dataType: 'json',
+    success: function () {
+      // Check was successful.
+      $('#edit-clean-url').attr('value', 1);
+    }
+  });
+  $('#edit-clean-url').addClass('clean-url-processed');
+};
+
+})(jQuery);
Index: modules/system/system-powered-by.js
===================================================================
RCS file: modules/system/system-powered-by.js
diff -N modules/system/system-powered-by.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/system/system-powered-by.js	16 Jun 2009 04:27:20 -0000
@@ -0,0 +1,16 @@
+// $Id$
+(function ($) {
+
+/**
+ * Show the powered by Drupal image preview
+ */
+Drupal.behaviors.poweredByPreview = {
+  attach: function (context, settings) {
+    $('#edit-color, #edit-size').change(function () {
+      var path = settings.basePath + 'misc/' + $('#edit-color').val() + '-' + $('#edit-size').val() + '.png';
+      $('img.powered-by-preview').attr('src', path);
+    });
+  }
+};
+
+})(jQuery);
Index: modules/system/system-time.js
===================================================================
RCS file: modules/system/system-time.js
diff -N modules/system/system-time.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/system/system-time.js	16 Jun 2009 04:27:20 -0000
@@ -0,0 +1,41 @@
+// $Id$
+(function ($) {
+
+/**
+ * Show/hide custom format sections on the regional settings page.
+ */
+Drupal.behaviors.dateTime = {
+  attach: function (context, settings) {
+    // Show/hide custom format depending on the select's value.
+    $('select.date-format:not(.date-time-processed)', context).change(function () {
+      $(this).addClass('date-time-processed').parents('div.date-container').children('div.custom-container')[$(this).val() == 'custom' ? 'show' : 'hide']();
+    });
+
+    // Attach keyup handler to custom format inputs.
+    $('input.custom-format:not(.date-time-processed)', context).addClass('date-time-processed').keyup(function () {
+      var input = $(this);
+      var url = settings.dateTime.lookup +(settings.dateTime.lookup.match(/\?q=/) ? '&format=' : '?format=') + Drupal.encodeURIComponent(input.val());
+      $.getJSON(url, function (data) {
+        $('div.description span', input.parent()).html(data);
+      });
+    });
+
+    // Trigger the event handler to show the form input if necessary.
+    $('select.date-format', context).trigger('change');
+  }
+};
+
+/**
+ * Show/hide settings for user configurable time zones depending on whether
+ * users are able to set their own time zones or not.
+ */
+Drupal.behaviors.userTimeZones = {
+  attach: function (context, settings) {
+    $('#empty-timezone-message-wrapper .description').hide();
+    $('#edit-configurable-timezones', context).change(function () {
+      $('#empty-timezone-message-wrapper').toggle();
+    });
+  },
+};
+
+})(jQuery);
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.156
diff -u -p -r1.156 system.admin.inc
--- modules/system/system.admin.inc	13 Jun 2009 19:28:57 -0000	1.156
+++ modules/system/system.admin.inc	16 Jun 2009 04:27:20 -0000
@@ -1507,7 +1507,7 @@ function system_rss_feeds_settings() {
  * @see system_regional_settings_submit()
  */
 function system_regional_settings() {
-  drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
+  drupal_add_js(drupal_get_path('module', 'system') . '/system-time.js');
   drupal_add_js(array('dateTime' => array('lookup' => url('admin/settings/regional-settings/lookup'))), 'setting');
 
   include_once DRUPAL_ROOT . '/includes/locale.inc';
@@ -1768,7 +1768,7 @@ function system_clean_url_settings() {
     $form = system_settings_form($form);
   }
   else {
-    drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
+    drupal_add_js(drupal_get_path('module', 'system') . '/system-clean-url.js');
 
     $form['#redirect'] = $base_url . '/admin/settings/clean-urls';
     $form['clean_url_description'] = array(
Index: modules/system/system.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.js,v
retrieving revision 1.26
diff -u -p -r1.26 system.js
--- modules/system/system.js	29 May 2009 19:51:43 -0000	1.26
+++ modules/system/system.js	16 Jun 2009 04:27:20 -0000
@@ -2,57 +2,6 @@
 (function ($) {
 
 /**
- * Internal function to check using Ajax if clean URLs can be enabled on the
- * settings page.
- *
- * This function is not used to verify whether or not clean URLs
- * are currently enabled.
- */
-Drupal.behaviors.cleanURLsSettingsCheck = {
-  attach: function (context, settings) {
-    // This behavior attaches by ID, so is only valid once on a page.
-    // Also skip if we are on an install page, as Drupal.cleanURLsInstallCheck will handle
-    // the processing.
-    if ($('.clean-url-processed, #edit-clean-url.install').size()) {
-      return;
-    }
-    var url = settings.basePath + 'admin/settings/clean-urls/check';
-    $.ajax({
-      url: location.protocol + '//' + location.host + url,
-      dataType: 'json',
-      success: function () {
-        // Check was successful. Redirect using a "clean URL". This will force the form that allows enabling clean URLs.
-        location = settings.basePath +"admin/settings/clean-urls";
-      }
-    });
-    $('#clean-url').addClass('clean-url-processed');
-  }
-};
-
-/**
- * Internal function to check using Ajax if clean URLs can be enabled on the
- * install page.
- *
- * This function is not used to verify whether or not clean URLs
- * are currently enabled.
- */
-Drupal.cleanURLsInstallCheck = function () {
-  var url = location.protocol + '//' + location.host + Drupal.settings.basePath + 'admin/settings/clean-urls/check';
-  // Submit a synchronous request to avoid database errors associated with
-  // concurrent requests during install.
-  $.ajax({
-    async: false,
-    url: url,
-    dataType: 'json',
-    success: function () {
-      // Check was successful.
-      $('#edit-clean-url').attr('value', 1);
-    }
-  });
-  $('#edit-clean-url').addClass('clean-url-processed');
-};
-
-/**
  * When a field is filled out, apply its value to other fields that will likely
  * use the same value. In the installer this is used to populate the
  * administrator e-mail address with the same value as the site e-mail address.
@@ -79,53 +28,4 @@ Drupal.behaviors.copyFieldValue = {
   }
 };
 
-/**
- * Show/hide custom format sections on the regional settings page.
- */
-Drupal.behaviors.dateTime = {
-  attach: function (context, settings) {
-    // Show/hide custom format depending on the select's value.
-    $('select.date-format:not(.date-time-processed)', context).change(function () {
-      $(this).addClass('date-time-processed').parents('div.date-container').children('div.custom-container')[$(this).val() == 'custom' ? 'show' : 'hide']();
-    });
-
-    // Attach keyup handler to custom format inputs.
-    $('input.custom-format:not(.date-time-processed)', context).addClass('date-time-processed').keyup(function () {
-      var input = $(this);
-      var url = settings.dateTime.lookup +(settings.dateTime.lookup.match(/\?q=/) ? '&format=' : '?format=') + Drupal.encodeURIComponent(input.val());
-      $.getJSON(url, function (data) {
-        $('div.description span', input.parent()).html(data);
-      });
-    });
-
-    // Trigger the event handler to show the form input if necessary.
-    $('select.date-format', context).trigger('change');
-  }
-};
-
-/**
- * Show/hide settings for user configurable time zones depending on whether
- * users are able to set their own time zones or not.
- */
-Drupal.behaviors.userTimeZones = {
-  attach: function (context, settings) {
-    $('#empty-timezone-message-wrapper .description').hide();
-    $('#edit-configurable-timezones', context).change(function () {
-      $('#empty-timezone-message-wrapper').toggle();
-    });
-  },
-};
-
-/**
- * Show the powered by Drupal image preview
- */
-Drupal.behaviors.poweredByPreview = {
-  attach: function (context, settings) {
-    $('#edit-color, #edit-size').change(function () {
-      var path = settings.basePath + 'misc/' + $('#edit-color').val() + '-' + $('#edit-size').val() + '.png';
-      $('img.powered-by-preview').attr('src', path);
-    });
-  }
-};
-
 })(jQuery);
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.711
diff -u -p -r1.711 system.module
--- modules/system/system.module	11 Jun 2009 04:36:22 -0000	1.711
+++ modules/system/system.module	16 Jun 2009 04:27:21 -0000
@@ -961,7 +961,7 @@ function system_block_list() {
 function system_block_configure($delta = '') {
   if ($delta == 'powered-by') {
     $image_path = 'misc/' . variable_get('drupal_badge_color', 'powered-blue') . '-' . variable_get('drupal_badge_size', '80x15') . '.png';
-    drupal_add_js(drupal_get_path('module', 'system') . '/system.js');
+    drupal_add_js(drupal_get_path('module', 'system') . '/system-powered-by.js');
     // Compile a list of fields to show
     $form['wrapper']['color'] = array(
       '#type' => 'select',