Projet

Général

Profil

Révision 5d940405

Ajouté par Assos Assos il y a environ 4 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/media_ckeditor/media_ckeditor.module
125 125
  else {
126 126
    $instance = FALSE;
127 127
  }
128
  // Build JavaScript data to be attached to the element.
129
  $data['media_ckeditor']['image_properties'] = variable_get('media_ckeditor_image_properties', FALSE);
128 130
  if (!empty($instance['settings']['wysiwyg_insert'])) {
129
    $element['#attached']['js'][] = array(
130
      'type' => 'setting',
131
      'data' => array(
132
        'media_ckeditor' => array(
133
          'wysiwyg_insert' => array(
134
            $element['#field_name'] => TRUE,
135
          ),
136
        ),
137
      ),
138
    );
131
    $data['media_ckeditor']['wysiwyg_insert'][$element['#field_name']] = TRUE;
139 132
  }
133
  $element['#attached']['js'][] = array(
134
    'type' => 'setting',
135
    'data' => $data,
136
  );
140 137
  return $element;
141 138
}
142 139

  
......
202 199
    '#description' => t('Check this box to render files in the WYSIWYG dynamically, to reflect any field overrides the user may have specified. Note that this requires the user has the corresponding permission: "View overridden file entities in wysiwyg"'),
203 200
    '#default_value' => variable_get('media_ckeditor_fully_rendered_files', FALSE),
204 201
  );
202
  $form['media_ckeditor']['media_ckeditor_image_properties'] = array(
203
    '#type' => 'checkbox',
204
    '#title' => t('Allow Image Properties configuration'),
205
    '#description' => t('Check this box to allow images inserted with the Media module to be resized and edited using the Image Properties menu option. Otherwise, resizing options should be provided as different image view modes.'),
206
    '#default_value' => variable_get('media_ckeditor_image_properties', FALSE),
207
  );
205 208
}
206 209

  
207 210
/**

Formats disponibles : Unified diff