Projet

Général

Profil

Révision ca0757b9

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.module
58 58
}
59 59

  
60 60
/**
61
 * Implements hook_media_wysiwyg_allowed_view_modes_alter().
61
 * Implements hook_media_wysiwyg_wysiwyg_allowed_view_modes_alter().
62 62
 */
63
function media_wysiwyg_view_mode_media_wysiwyg_allowed_view_modes_alter(&$view_modes, &$file) {
63
function media_wysiwyg_view_mode_media_wysiwyg_wysiwyg_allowed_view_modes_alter(&$view_modes, &$file) {
64 64
  if (variable_get("media_wysiwyg_view_mode_{$file->type}_wysiwyg_restricted_view_modes_status", FALSE) == TRUE) {
65 65
    $restricted_view_modes = variable_get("media_wysiwyg_view_mode_{$file->type}_wysiwyg_restricted_view_modes", array());
66 66

  
......
73 73
}
74 74

  
75 75
/**
76
 * Implements hook_media_token_to_markup_alter().
76
 * Implements hook_media_wysiwyg_token_to_markup_alter().
77 77
 */
78
function media_wysiwyg_view_mode_media_token_to_markup_alter(&$element, $tag_info, $settings) {
78
function media_wysiwyg_view_mode_media_wysiwyg_token_to_markup_alter(&$element, $tag_info, $settings) {
79 79
  if (!empty($settings['wysiwyg'])) {
80 80
    $file = $tag_info['file'];
81 81

  
82 82
    if (variable_get("media_wysiwyg_view_mode_{$file->type}_file_wysiwyg_view_mode_status", FALSE) == TRUE) {
83
      $element = media_get_file_without_label($file, variable_get("media_wysiwyg_view_mode_{$file->type}_file_wysiwyg_view_mode", 'wysiwyg'), $settings);
83
      $element = media_wysiwyg_get_file_without_label($file, variable_get("media_wysiwyg_view_mode_{$file->type}_file_wysiwyg_view_mode", 'wysiwyg'), $settings);
84 84
    }
85 85
    else {
86
      $element = media_get_file_without_label($file, $tag_info['view_mode'], $settings);
86
      $element = media_wysiwyg_get_file_without_label($file, $tag_info['view_mode'], $settings);
87 87
    }
88 88
  }
89 89
}
......
93 93
 */
94 94
function media_wysiwyg_view_mode_form_alter(&$form, $form_state, $form_id)  {
95 95
  switch ($form_id)  {
96
    case 'media_format_form':
97
      $file = $form['#media'];
96
    case 'media_wysiwyg_format_form':
97
      $file = $form_state['file'];
98 98

  
99
      $default_view_mode = variable_get('media__wysiwyg_default_view_mode', 'full');
100

  
101
      $view_mode = !empty($form_state['values']['format']) ? $form_state['values']['format'] : $default_view_mode;
99
      // Check to see if a view mode ("format") has already been specified for
100
      //  this media item. First, check for a standard form-submitted value.
101
      if (!empty($form_state['values']['format'])) {
102
        $view_mode = $form_state['values']['format'];
103
      }
104
      // Second, check the request for a JSON-encoded value.
105
      elseif (isset($_GET['fields'])) {
106
        $query_fields = drupal_json_decode($_GET['fields']);
107
        if (isset($query_fields['format'])) {
108
          $view_mode = $query_fields['format'];
109
        }
110
      }
111
      // If we were unable to determine a view mode, or we found a view mode
112
      //  that does not exist in the list of format options presented on this
113
      //  form, use the default view mode.
114
      if (!isset($view_mode) || !array_key_exists($view_mode, $form['options']['format']['#options'])) {
115
        $view_mode = variable_get('media_wysiwyg_wysiwyg_default_view_mode', 'full');
116
      }
102 117

  
103 118
      $form['preview'] = file_view_file($file, $view_mode);
104 119
      $form['preview']['#prefix'] = '<div id="preview">';
......
112 127
        'wrapper' => 'preview',
113 128
      );
114 129

  
115
      $view_modes = media_get_wysiwyg_allowed_view_modes($file);
130
      $view_modes = media_wysiwyg_get_wysiwyg_allowed_view_modes($file);
116 131
      $formats = $options = array();
117 132
      foreach ($view_modes as $view_mode => $view_mode_info) {
118 133
        //@TODO: Display more verbose information about which formatter and what it does.
119 134
        $options[$view_mode] = $view_mode_info['label'];
120 135

  
121 136
        if (variable_get("media_wysiwyg_view_mode_{$file->type}_file_wysiwyg_view_mode_status", FALSE) == TRUE) {
122
          $element = media_get_file_without_label($file, variable_get("media_wysiwyg_view_mode_{$file->type}_file_wysiwyg_view_mode", 'wysiwyg'), array('wysiwyg' => TRUE));
137
          $element = media_wysiwyg_get_file_without_label($file, variable_get("media_wysiwyg_view_mode_{$file->type}_file_wysiwyg_view_mode", 'wysiwyg'), array('wysiwyg' => TRUE));
123 138
        }
124 139
        else {
125
          $element = media_get_file_without_label($file, $view_mode, array('wysiwyg' => TRUE));
140
          $element = media_wysiwyg_get_file_without_label($file, $view_mode, array('wysiwyg' => TRUE));
126 141
        }
127 142

  
128 143
        // Make a pretty name out of this.

Formats disponibles : Unified diff