Project

General

Profile

Revision 1f142f4f

Added by Florent Torregrosa over 8 years ago

Issue #592: Update file_entity to version 7.x-2.0-beta2.

View differences:

drupal7/sites/all/modules/file_entity/file_entity.field.inc
36 36
      'controls' => TRUE,
37 37
      'autoplay' => FALSE,
38 38
      'loop' => FALSE,
39
      'preload' => '',
39 40
      'multiple_file_behavior' => 'tags',
40 41
    ),
41 42
    'file formatter' => array(
......
53 54
      'muted' => FALSE,
54 55
      'width' => NULL,
55 56
      'height' => NULL,
57
      'preload' => '',
56 58
      'multiple_file_behavior' => 'tags',
57 59
    ),
58 60
    'file formatter' => array(
......
131 133
      '#type' => 'checkbox',
132 134
      '#default_value' => $settings['loop'],
133 135
    );
136
    $element['preload'] = array(
137
      '#title' => t('Preload'),
138
      '#type' => 'select',
139
      '#default_value' => $settings['preload'],
140
      '#options' => drupal_map_assoc(array('none', 'auto', 'metadata')),
141
      '#empty_option' => 'unspecified',
142
    );
134 143
    $element['multiple_file_behavior'] = array(
135 144
      '#title' => t('Display of multiple files'),
136 145
      '#type' => 'radios',
......
181 190
      '#maxlength' => 5,
182 191
      '#field_suffix' => t('pixels'),
183 192
    );
193
    $element['preload'] = array(
194
      '#title' => t('Preload'),
195
      '#type' => 'select',
196
      '#default_value' => $settings['preload'],
197
      '#options' => drupal_map_assoc(array('none', 'auto', 'metadata')),
198
      '#empty_option' => 'unspecified',
199
    );
184 200
    $element['multiple_file_behavior'] = array(
185 201
      '#title' => t('Display of multiple files'),
186 202
      '#type' => 'radios',
......
222 238
    if (isset($settings['loop'])) {
223 239
      $summary[] = t('Loop: %loop', array('%loop' => $settings['loop'] ? t('yes') : t('no')));
224 240
    }
241
    if (!empty($settings['preload'])) {
242
      $summary[] = t('Preload: %preload', array('%preload' => $settings['preload']));
243
    }
225 244
    if (isset($settings['multiple_file_behavior'])) {
226 245
      $summary[] = t('Multiple files: %multiple', array('%multiple' => $settings['multiple_file_behavior']));
227 246
    }
......
242 261
    if ($settings['width'] && $settings['height']) {
243 262
      $summary[] = t('Size: %width x %height', array('%width' => $settings['width'], '%height' => $settings['height']));
244 263
    }
264
    if (!empty($settings['preload'])) {
265
      $summary[] = t('Preload: %preload', array('%preload' => $settings['preload']));
266
    }
245 267
    if (isset($settings['multiple_file_behavior'])) {
246 268
      $summary[] = t('Multiple files: %multiple', array('%multiple' => $settings['multiple_file_behavior']));
247 269
    }
......
357 379
        '#controls' => $settings['controls'],
358 380
        '#autoplay' => $settings['autoplay'],
359 381
        '#loop' => $settings['loop'],
382
        '#preload' => $settings['preload'],
360 383
      );
361 384
    }
362 385
  }
......
394 417
        '#muted' => $settings['muted'],
395 418
        '#width' => $settings['width'],
396 419
        '#height' => $settings['height'],
420
        '#preload' => $settings['preload'],
397 421
      );
398 422
    }
399 423
  }

Also available in: Unified diff