7.x 4.x

README.txt → README.md

@@ -1,15 +1,4 @@
-// $Id$
-
-CONTENTS OF THIS FILE
----------------------
-
- * Introduction
- * Installation
- * Credits
-
-
-INTRODUCTION
-------------
+# jQuery Update Drupal Module
 
 jQuery Update module upgrades Drupal's stable version of jQuery in order to
 support the most current jQuery version available.
@@ -21,18 +10,17 @@ support the most recent version, so this module ensures that your Drupal
 installation can run the most up-to-date jQuery plug-ins.
 
 
-INSTALLATION
-------------
+## Installation
 
 1. Copy the jquery_update directory to your sites/SITENAME/modules directory.
 
 2. Enable the module at Administer >> Site building >> Modules.
 
 
-CREDITS
--------
+## Credits
+
 * Matt Farina (mfer)
 * Jeff Robbins (jjeff)
 * Angela Byron (webchick)
 * Addison Berry (add1sun)
-* Rob Loach
+* Rob Loach (RobLoach)

jquery_update.admin.inc

@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * @file
+ * Provides the administration settings for jQuery Update.
+ */
+
+/**
+ * Admin settings menu callback.
+ *
+ * @see jquery_update_menu()
+ */
+function jquery_update_settings_form() {
+  // Vertical Tabs.
+  $form['jquery_update'] = array(
+    '#type' => 'vertical_tabs',
+    '#weight' => 99,
+  );
+
+  // Provide the form item to choose which jQuery version to use.
+  $default_version = variable_get('jquery_update_jquery_version', '1.10');
+  $version_options = jquery_update_get_version_options(FALSE);
+  $form['jquery_update_jquery_version'] = array(
+    '#type' => 'select',
+    '#title' => t('Default jQuery version'),
+    '#options' => $version_options,
+    '#default_value' => $default_version,
+    '#description' => t('Select which version of jQuery to use on the site.'),
+  );
+
+  // Theme-specific override version
+  $themes = list_themes();
+  $theme_default = variable_get('theme_default', FALSE);
+  $admin_theme = variable_get('admin_theme', FALSE);
+  $header = array(t('Theme'), t('jQuery version'), t('Operations'));
+  $rows = array();
+  // Go through all themes.
+  foreach ($themes as $theme_key => $theme) {
+    // Skip disabled themes, but only if they are not configured as admin
+    // theme. This is an inconsistency in drupal core, that you can select a
+    // disabled theme as admin theme.
+    if (!$theme->status && $theme_key !== $admin_theme) {
+      continue;
+    }
+
+    // Retrieve the version jQuery for this theme.
+    $theme_version = theme_get_setting('jquery_update_jquery_version', $theme_key);
+
+    // Replace or modify the version name to be displayed.
+    if (empty($theme_version)) {
+      $theme_version = t('Site Default');
+    }
+    elseif (in_array($theme_version, array_keys($version_options))) {
+      $theme_version = $version_options[$theme_version];
+    }
+    else {
+      $theme_version .= ' (' . t('unknown version') . ')';
+    }
+
+    // Provide additional information for default and admin themes.
+    $theme_name = $theme->info['name'];
+    if ($theme_key === $theme_default && ($theme_key === $admin_theme || empty($admin_theme))) {
+      $theme_name .= ' (' . t('default/admin theme') . ')';
+    }
+    elseif ($theme_key === $theme_default) {
+      $theme_name .= ' (' . t('default theme') . ')';
+    }
+    elseif ($theme_key === $admin_theme) {
+      $theme_name .= ' (' . t('admin theme') . ')';
+    }
+
+    // Construct the table row.
+    $rows[] = array(
+      $theme_name,
+      $theme_version,
+      l(t('Configure'), 'admin/appearance/settings/' . $theme_key, array(
+        'attributes' => array(
+          'class' => array(
+            'module-link',
+            'module-link-configure',
+          ),
+        ),
+        'query' => drupal_get_destination(),
+        'fragment' => 'edit-jquery-update',
+      )),
+    );
+  }
+
+  $form['themes'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Theme Overrides'),
+    '#description' => t('You can override the default jQuery version above on each themes settings page. This is useful for administrative based themes.'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
+    '#tree' => FALSE,
+    '#weight' => -2,
+    '#group' => 'jquery_update',
+  );
+  $form['themes']['overrides'] = array(
+    '#theme' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+  );
+
+
+  $form['performance'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Performance'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
+    '#tree' => FALSE,
+    '#weight' => -1,
+    '#group' => 'jquery_update',
+    '#description' => t('Modify how jQuery is loaded to increase download and render performance.')
+  );
+
+  $form['performance']['jquery_update_compression_type'] = array(
+    '#type' => 'radios',
+    '#title' => t('jQuery compression level'),
+    '#options' => array(
+      'min' => t('Production (minified)'),
+      'none' => t('Development (uncompressed)'),
+    ),
+    // Do not show this field if jQuery version is default
+    '#states' => array(
+      'invisible' => array(
+        ':input[name=jquery_update_jquery_version]' => array('value' => "default"),
+      ),
+    ),
+    '#default_value' => variable_get('jquery_update_compression_type', 'min'),
+  );
+  $form['performance']['jquery_update_jquery_cdn'] = array(
+    '#type' => 'select',
+    '#title' => t('jQuery and jQuery UI CDN'),
+    '#options' => array(
+      'none' => t('None'),
+      'google' => t('Google'),
+      'microsoft' => t('Microsoft'),
+      'jquery' => t('jQuery'),
+    ),
+    // Do not show this field if jQuery version is default
+    '#states' => array(
+      'invisible' => array(
+        ':input[name=jquery_update_jquery_version]' => array('value' => "default"),
+      ),
+    ),
+    '#default_value' => variable_get('jquery_update_jquery_cdn', 'none'),
+    '#description' => t('Use jQuery and jQuery UI from a CDN. If the CDN is not available the local version of jQuery and jQuery UI will be used.'),
+  );
+
+  $form['jquery_migrate'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('jQuery Migrate'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
+    '#tree' => FALSE,
+    '#group' => 'jquery_update',
+    '#description' => t('<a href="!url">jQuery Migrate</a> can be used to detect and restore APIs or features that have been deprecated in jQuery and removed as of version 1.9 or higher.', array(
+      '!url' => 'http://github.com/jquery/jquery-migrate/#readme',
+    )),
+  );
+
+  $form['jquery_migrate']['jquery_update_jquery_migrate_enable'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable jQuery Migrate Plugin'),
+    '#default_value' => variable_get('jquery_update_jquery_migrate_enable', FALSE),
+    '#description' => t('Even if jQuery Migrate is enabled, it will not be loaded if the current page\'s jQuery version is lower than 1.9.'),
+  );
+
+  $jquery_migrate_states = array(
+    'visible' => array(
+      ':input[name="jquery_migrate[jquery_update_jquery_migrate_enable]"]' => array('checked' => TRUE),
+    ),
+  );
+  $form['jquery_migrate']['jquery_update_jquery_migrate_cdn'] = array(
+    '#type' => 'select',
+    '#title' => t('jQuery Migrate CDN'),
+    '#options' => array(
+      'none' => t('None'),
+      'jquery' => t('jQuery'),
+    ),
+    '#default_value' => variable_get('jquery_update_jquery_migrate_cdn', 'none'),
+    '#description' => t('Load the jQuery Migrate plugin using a CDN. If the CDN is not available the local module version of the plugin will be used instead.'),
+    '#states' => $jquery_migrate_states,
+  );
+
+  $jquery_migrate_api_url = 'https://github.com/jquery/jquery-migrate/#migrate-plugin-api';
+  $form['jquery_migrate']['jquery_update_jquery_migrate_warnings'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Console warnings'),
+    '#default_value' => variable_get('jquery_update_jquery_migrate_warnings', FALSE),
+    '#description' => t('Toggle the <a href="!url">generation of console warnings</a> when using the debug version of jQuery Migrate.', array(
+      '!url' => $jquery_migrate_api_url,
+    )),
+    '#states' => $jquery_migrate_states,
+  );
+
+  $form['jquery_migrate']['jquery_update_jquery_migrate_trace'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Console trace'),
+    '#default_value' => variable_get('jquery_update_jquery_migrate_trace', FALSE),
+    '#description' => t('Toggle the <a href="!url">generation of console trace messages</a> when using the debug version of jQuery Migrate.', array(
+      '!url' => $jquery_migrate_api_url,
+    )),
+    '#states' => $jquery_migrate_states,
+  );
+
+  return system_settings_form($form);
+}

jquery_update.info

@@ -1,7 +1,6 @@
-; $Id$
 name = jQuery Update
-description = Updates jQuery to jQuery 1.4.2 and jQuery UI 1.8.4.
+description = Update jQuery and jQuery UI to a more recent version.
 package = User interface
 core = 7.x
-files[] = jquery_update.module
-files[] = jquery_update.install
+
+configure = admin/config/development/jquery_update

jquery_update.install

@@ -1,13 +1,12 @@
 <?php
-// $Id$
 
 /**
  * @file
  * Install file for jQuery Update.
  */
 
 /**
- * Implementation of hook_requirements().
+ * Implements hook_requirements().
  */
 function jquery_update_requirements($phase) {
   $requirements = array();
@@ -19,27 +18,85 @@ function jquery_update_requirements($phase) {
     $requirements['jquery_update'] = array(
       'title' => $t('jQuery Update'),
       'severity' => REQUIREMENT_OK,
-      'value' => t('jQuery %jquery and jQuery UI %ui', array('%jquery' => $jquery['version'], '%ui' => $ui['version'])),
+      'value' => t('jQuery %jquery (<a href="@link">configure</a>) and jQuery UI %ui', array('%jquery' => $jquery['version'], '%ui' => $ui['version'], '@link' => url('admin/config/development/jquery_update'))),
     );
   }
 
   return $requirements;
 }
 
 /**
- * Implementation of hook_uninstall().
+ * Helper function for setting a theme jQuery version during install or update.
+ *
+ * @param string $theme_key
+ *   The machine name of the theme to set.
+ * @param string $version
+ *   The MAJOR.MINOR jQuery version to set.
+ */
+function _jquery_update_set_theme_version($theme_key, $version) {
+  // Retrieve the cached theme settings.
+  theme_get_setting('jquery_update_jquery_version', $theme_key);
+  $theme_settings = drupal_static('theme_get_setting', array());
+
+  // Set the jQuery version.
+  $theme_settings[$theme_key]['jquery_update_jquery_version'] = $version;
+  variable_set('theme_' . $theme_key . '_settings', $theme_settings[$theme_key]);
+}
+
+/**
+ * Implements hook_install().
+ */
+function jquery_update_install() {
+  // Use core's default jQuery version for the "seven" admin theme.
+  _jquery_update_set_theme_version('seven', 'default');
+}
+
+/**
+ * Implements hook_uninstall().
  */
 function jquery_update_uninstall() {
   variable_del('jquery_update_compression_type');
+  variable_del('jquery_update_jquery_version');
+  variable_del('jquery_update_jquery_cdn');
 }
 
 /**
- * The packed version of jQuery is no longer distributed. If that is the chosen
- * version update to minified.
+ * Update from Drupal 6.
  */
 function jquery_update_update_7000() {
   if (variable_get('jquery_update_compression_type', 'min') == 'pack') {
     variable_set('jquery_update_compression_type', 'min');
   }
   variable_del('jquery_update_replace');
+
+  // Restore the default version of jQuery.
+  variable_del('jquery_update_jquery_version');
+}
+
+/**
+ * Convert jquery_update_jquery_admin_version to an admin theme setting.
+ */
+function jquery_update_update_7001() {
+  // Detect if the previous feature of the "admin version" variable is set.
+  // @see https://www.drupal.org/node/1969244
+  $admin_theme = variable_get('admin_theme', FALSE);
+  $admin_version = variable_get('jquery_update_jquery_admin_version', 'default');
+
+  // Ensure that if "seven" is set as the admin theme and no "admin version"
+  // is present, the version used on the admin theme is the "default" core
+  // provides to ensure major compatibility with contrib modules.
+  if (!$admin_version && $admin_theme === 'seven') {
+    $admin_version = 'default';
+  }
+  // Skip this update if the "admin version" was never set and the admin theme
+  // is not set as "seven".
+  elseif (!$admin_version) {
+    return;
+  }
+
+  // Continue setting the admin theme jQuery version.
+  _jquery_update_set_theme_version($admin_theme, $admin_version);
+
+  // Remove the admin version variable.
+  variable_del('jquery_update_jquery_admin_version');
 }