diff --git a/jquery_update.module b/jquery_update.module index 956c9e5..fcce335 100644 --- a/jquery_update.module +++ b/jquery_update.module @@ -82,7 +82,8 @@ function jquery_update_library_alter(&$javascript, $module) { // Modified System Library. if ($module === 'system') { - // Make sure we inject either the minified or uncompressed version as desired. + // Make sure we inject either the minified or uncompressed + // version as desired. $min = variable_get('jquery_update_compression_type', 'min') == 'none' ? '' : '.min'; $cdn = variable_get('jquery_update_jquery_cdn', 'none'); @@ -111,7 +112,7 @@ function jquery_update_library_alter(&$javascript, $module) { ); $javascript['drupal.ajax']['dependencies'][] = array('jquery_update', 'jquery_update.ajax.fix'); - // Don't replace anything if Drupal provided jQuery should be used + // Don't replace anything if Drupal provided jQuery should be used. if ('default' == $version) { return; } @@ -133,7 +134,7 @@ function jquery_update_library_alter(&$javascript, $module) { $javascript['jquery.form']['js']['misc/jquery.form.js']['data'] = $path . '/replace/misc/jquery.form' . $min . '.js'; $javascript['jquery.form']['version'] = '2.69'; - // Replace files for Jquery 1.9 and up + // Replace files for Jquery 1.9 and up. if (version_compare($version, '1.9', '>=')) { $javascript['jquery.bbq']['js']['misc/jquery.ba-bbq.js']['data'] = $path . '/replace/misc/1.9/jquery.ba-bbq' . $min . '.js'; } @@ -209,7 +210,7 @@ function jquery_update_settings_form() { 'min' => t('Production (minified)'), 'none' => t('Development (uncompressed)'), ), - // Do not show this field if jQuery version is default + // Do not show this field if jQuery version is default. '#states' => array( 'invisible' => array( ':input[name=jquery_update_jquery_version]' => array('value' => "default"), @@ -226,7 +227,7 @@ function jquery_update_settings_form() { 'microsoft' => t('Microsoft'), 'jquery' => t('jQuery'), ), - // Do not show this field if jQuery version is default + // Do not show this field if jQuery version is default. '#states' => array( 'invisible' => array( ':input[name=jquery_update_jquery_version]' => array('value' => "default"), @@ -350,14 +351,17 @@ function jquery_update_jquery_backup(&$javascript, $path, $min, $version) { * version. */ function jquery_update_jqueryui_replace(&$javascript, $cdn, $path, $min) { - // Add new components + // Add new components. $javascript['ui.menu'] = array( 'title' => 'jQuery UI: Menu', 'website' => 'http://jqueryui.com/demos/menu/', 'version' => '1.10.2', 'js' => array('misc/ui/jquery.ui.menu.min.js' => array()), 'css' => array('misc/ui/jquery.ui.menu.css' => array()), - 'dependencies' => array(array('system', 'ui.widget'), array('system', 'ui.position')), + 'dependencies' => array( + array('system', 'ui.widget'), + array('system', 'ui.position'), + ), ); $javascript['ui.spinner'] = array( 'title' => 'jQuery UI: Spinner', @@ -365,7 +369,10 @@ function jquery_update_jqueryui_replace(&$javascript, $cdn, $path, $min) { 'version' => '1.10.2', 'js' => array('misc/ui/jquery.ui.spinner.min.js' => array()), 'css' => array('misc/ui/jquery.ui.spinner.css' => array()), - 'dependencies' => array(array('system', 'ui.widget'), array('system', 'ui.button')), + 'dependencies' => array( + array('system', 'ui.widget'), + array('system', 'ui.button'), + ), ); $javascript['ui.tooltip'] = array( 'title' => 'jQuery UI: Spinner', @@ -373,10 +380,13 @@ function jquery_update_jqueryui_replace(&$javascript, $cdn, $path, $min) { 'version' => '1.10.2', 'js' => array('misc/ui/jquery.ui.tooltip.min.js' => array()), 'css' => array('misc/ui/jquery.ui.tooltip.css' => array()), - 'dependencies' => array(array('system', 'ui.widget'), array('system', 'ui.position')), + 'dependencies' => array( + array('system', 'ui.widget'), + array('system', 'ui.position'), + ), ); - // fix dependencies + // Fix dependencies. $javascript['ui.autocomplete']['dependencies'][] = array('system', 'ui.menu'); // Replace all CSS files. $names = drupal_map_assoc(array( @@ -430,12 +440,15 @@ function jquery_update_jqueryui_replace(&$javascript, $cdn, $path, $min) { /** * Create a mapping from system.module library hooks to file name segments. * - * @param array $map Optional. If given, append to it. - * @return array The keys are library hooks and the values are each arrays of - * 2 file name segments as values. The first file name segment can be used to - * reach Drupal core's jQuery UI effect files, and the second file name segment - * can be used to construct a path to the equivalent replacement - * jQuery UI effect file provided by jquery_update.module. + * @param array $map + * Optional. If given, append to it. + * + * @return array + * The keys are library hooks and the values are each arrays of + * 2 file name segments as values. The first file name segment can be used to + * reach Drupal core's jQuery UI effect files, and the second file name + * segment can be used to construct a path to the equivalent replacement + * jQuery UI effect file provided by jquery_update.module. */ function jquery_update_make_library_hook_to_file_name_segment_map_for_effects($map = array()) { $effect_names = array( @@ -444,9 +457,13 @@ function jquery_update_make_library_hook_to_file_name_segment_map_for_effects($m ); foreach ($effect_names as $effect_name) { $library_hook = 'effects.' . $effect_name; - $file_name_segment_core = $library_hook; // Yes, for the effect files, this is indeed identical. + // Yes, for the effect files, the following is indeed identical. + $file_name_segment_core = $library_hook; $file_name_segment_updated = 'ui.effect-' . $effect_name; - $map[$library_hook] = array($file_name_segment_core, $file_name_segment_updated); + $map[$library_hook] = array( + $file_name_segment_core, + $file_name_segment_updated, + ); } return $map; }