Commit 65eecb0f authored by Eric Duran's avatar Eric Duran
Browse files

Issue #2023789 by ericduran: Added Offer latest jQuery 1.10.x as an option (currently 1.10.2).

parent 8154d5b3
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ function jquery_update_library() {
 */
function jquery_update_library_alter(&$javascript, $module) {
  $path = drupal_get_path('module', 'jquery_update');
  $version = variable_get('jquery_update_jquery_version', '1.9');
  $version = variable_get('jquery_update_jquery_version', '1.10');


  // Modified System Library.
@@ -172,8 +172,9 @@ function jquery_update_settings_form() {
      '1.7' => '1.7',
      '1.8' => '1.8',
      '1.9' => '1.9',
      '1.10' => '1.10',
    ),
    '#default_value' => variable_get('jquery_update_jquery_version', '1.9'),
    '#default_value' => variable_get('jquery_update_jquery_version', '1.10'),
    '#description' => t('Select which jQuery version to use by default.'),
  );

@@ -185,7 +186,7 @@ function jquery_update_settings_form() {
      '1.5' => '1.5',
      '1.7' => '1.7',
      '1.8' => '1.8',
      '1.9' => '1.9',
      '1.10' => '1.10',
    ),
    '#default_value' => variable_get('jquery_update_jquery_admin_version', ''),
    '#description' => t('Optionally select a different version of jQuery to use on administrative pages.'),
@@ -238,7 +239,7 @@ function jquery_update_jquery_replace(&$javascript, $cdn, $path, $min, $version)
  // If the ajax version is set then that one always win.
  if (!empty($_POST['ajax_page_state']['jquery_version'])) {
    $ajax_version = $_POST['ajax_page_state']['jquery_version'];
    if (in_array($ajax_version, array('1.5', '1.6', '1.7', '1.8', '1.9'))) {
    if (in_array($ajax_version, array('1.5', '1.6', '1.7', '1.8', '1.9', '1.10'))) {
      $version = $ajax_version;
    }
  }
@@ -261,6 +262,10 @@ function jquery_update_jquery_replace(&$javascript, $cdn, $path, $min, $version)
    case '1.9':
      $trueversion = '1.9.1';
      break;

    case '1.10':
      $trueversion = '1.10.2';
      break;
  }
  $javascript['jquery']['version'] = $trueversion;

+1 −0

File added.

Preview size limit exceeded, changes collapsed.

+9789 −0

File added.

Preview size limit exceeded, changes collapsed.

+6 −0

File added.

Preview size limit exceeded, changes collapsed.