Project

General

Profile

Revision dbb0c974

Added by Assos Assos about 10 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/colorbox/colorbox.module
82 82
    'download url' => 'https://github.com/jackmoore/colorbox/archive/1.x.zip',
83 83
    'version arguments' => array(
84 84
      'file' => 'jquery.colorbox-min.js',
85
      'pattern' => '@(?i:Colorbox) v([0-9\.a-z]+)@',
85
      'pattern' => '@(?i:Colorbox)\sv?([0-9\.a-z]+)@',
86 86
      'lines' => 5,
87 87
    ),
88 88
    'files' => array(
......
142 142
    return FALSE;
143 143
  }
144 144

  
145
  // Code from the block_list funtion in block.module.
145
  // Code from the block_list function in block.module.
146 146
  $path = drupal_get_path_alias($_GET['q']);
147 147
  $colorbox_pages = variable_get('colorbox_pages', "admin*\nimagebrowser*\nimg_assist*\nimce*\nnode/add/*\nnode/*/edit\nprint/*\nprintpdf/*\nsystem/ajax\nsystem/ajax/*");
148 148
  // Compare with the internal and path alias (if any).
......
178 178
      'slideshowSpeed' => variable_get('colorbox_slideshowspeed', 2500),
179 179
      'slideshowStart' => variable_get('colorbox_text_start', 'start slideshow'),
180 180
      'slideshowStop' => variable_get('colorbox_text_stop', 'stop slideshow'),
181
      'current' => variable_get('colorbox_text_current', '{current} of {total}'),
182
      'previous' => variable_get('colorbox_text_previous', '« Prev'),
183
      'next' => variable_get('colorbox_text_next', 'Next »'),
184
      'close' => variable_get('colorbox_text_close', 'Close'),
181
      'current' => strip_tags(variable_get('colorbox_text_current', '{current} of {total}')),
182
      'previous' => strip_tags(variable_get('colorbox_text_previous', '« Prev')),
183
      'next' => strip_tags(variable_get('colorbox_text_next', 'Next »')),
184
      'close' => strip_tags(variable_get('colorbox_text_close', 'Close')),
185 185
      'overlayClose' => variable_get('colorbox_overlayclose', 1) ? TRUE : FALSE,
186 186
      'maxWidth' => variable_get('colorbox_maxwidth', '98%'),
187 187
      'maxHeight' => variable_get('colorbox_maxheight', '98%'),
......
219 219

  
220 220
  // Add and initialise the Colorbox plugin.
221 221
  $variant = variable_get('colorbox_compression_type', 'minified');
222
  libraries_load('colorbox', $variant);
222
  if (module_exists('libraries')) {
223
    libraries_load('colorbox', $variant);
224
  }
223 225
  drupal_add_js($path . '/js/colorbox.js');
224 226

  
225 227
  // Add JS and CSS based on selected style.
......
347 349
    '#type' => 'select',
348 350
    '#default_value' => $settings['colorbox_caption'],
349 351
    '#options' => $caption,
350
    '#description' => t('Automatic will use the first none empty value of the title, the alt text and the content title.'),
352
    '#description' => t('Automatic will use the first non-empty value of the title, the alt text and the content title.'),
351 353
  );
352 354
  $element['colorbox_caption_custom'] = array(
353 355
    '#title' => t('Custom caption'),

Also available in: Unified diff