Projet

Général

Profil

Révision 7e72b748

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ctools/includes/modal.inc
55 55
        'alt' => t('Close window'),
56 56
      )),
57 57
      'throbber' => theme('image', array(
58
          'path' => ctools_image_path('throbber.gif'),
59
          'title' => t('Loading...'),
60
          'alt' => t('Loading'),
58
        'path' => ctools_image_path('throbber.gif'),
59
        'title' => t('Loading...'),
60
        'alt' => t('Loading'),
61 61
      )),
62 62
    ),
63 63
  );
......
85 85
        if (file_exists($file)) {
86 86
          $js[$file] = TRUE;
87 87
        }
88
        else if (file(exists($subtype['path'] . '/' . $file))) {
88
        elseif (file(exists($subtype['path'] . '/' . $file))) {
89 89
          $js[$subtype['path'] . '/' . $file] = TRUE;
90 90
        }
91 91
      }
......
95 95
        if (file_exists($file)) {
96 96
          $css[$file] = TRUE;
97 97
        }
98
        else if (file(exists($subtype['path'] . '/' . $file))) {
98
        elseif (file(exists($subtype['path'] . '/' . $file))) {
99 99
          $css[$subtype['path'] . '/' . $file] = TRUE;
100 100
        }
101 101
      }
......
140 140
}
141 141

  
142 142
/**
143
 * Display loading screen in the modal
143
 * Display loading screen in the modal.
144 144
 */
145 145
function ctools_modal_command_loading() {
146 146
  return array(
......
189 189
 * Wrap a form so that we can use it properly with AJAX. Essentially if the
190 190
 * form wishes to render, it automatically does that, otherwise it returns
191 191
 * the render array so we can see submission results.
192

  
192
 *
193 193
 * @param array $form
194 194
 *   An associative array containing the structure of the form.
195 195
 * @param array $form_state
......
222 222

  
223 223
  $output = drupal_build_form($form_id, $form_state);
224 224
  if (!empty($form_state['ajax']) && (!$form_state['executed'] || $form_state['rebuild'])) {
225
     return ctools_modal_form_render($form_state, $output);
225
    return ctools_modal_form_render($form_state, $output);
226 226
  }
227 227

  
228 228
  return $output;

Formats disponibles : Unified diff