X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fcrop%2Fcrop.module;h=0145a448b498f5a511543e27ba998e5b61d1b2e6;hb=refs%2Fheads%2Fd864;hp=18e19853bed7956e9c41078a3803f3ef7e2aa59d;hpb=af6d1fb995500ae68849458ee10d66abbdcfb252;p=yaffs-website

diff --git a/web/modules/contrib/crop/crop.module b/web/modules/contrib/crop/crop.module
index 18e19853b..0145a448b 100644
--- a/web/modules/contrib/crop/crop.module
+++ b/web/modules/contrib/crop/crop.module
@@ -6,14 +6,14 @@
  *
  * Provides storage and API for image crops.
  */
+
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\crop\Entity\Crop;
 use Drupal\image\Entity\ImageStyle;
-use Drupal\media\Entity\MediaType;
+use Drupal\media\MediaSourceInterface;
 use Drupal\media\MediaTypeInterface;
-use Drupal\media_entity\MediaBundleInterface;
 use Drupal\file\FileInterface;
 
 /**
@@ -42,28 +42,10 @@ function template_preprocess_crop_crop_summary(&$variables) {
 /**
  * Implements hook_form_FORM_ID_alter().
  *
- * Adds crop configuration fields to media type form.
+ * Adds crop configuration fields to media form.
  */
 function crop_form_media_type_edit_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  _crop_media_provider_form($form, $form_state);
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Adds crop configuration fields to media bundle form.
- */
-function crop_form_media_bundle_edit_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  _crop_media_provider_form($form, $form_state);
-}
-
-/**
- * Helper function to avoid uneeded code duplication.
- *
- * @todo Delete this and media entity fallback when media is stable.
- */
-function _crop_media_provider_form(array &$form, FormStateInterface $form_state) {
-  /** @var \Drupal\Core\Config\Entity\ConfigEntityBundleBase $entity_type */
+  /** @var \Drupal\media\Entity\MediaType $entity_type */
   $entity_type = $form_state->getFormObject()->getEntity();
   $options = [];
   $allowed_field_types = ['file', 'image'];
@@ -76,14 +58,7 @@ function _crop_media_provider_form(array &$form, FormStateInterface $form_state)
     }
   }
 
-  // Maintain compatibility with Media Entity.
-  if ($entity_type instanceof MediaType) {
-    $form['#entity_builders'][] = 'crop_media_type_form_builder';
-  }
-  else {
-    $form['#entity_builders'][] = 'crop_media_bundle_form_builder';
-  }
-
+  $form['#entity_builders'][] = 'crop_media_type_form_builder';
   $form['crop'] = [
     '#type' => 'fieldset',
     '#title' => t('Crop configuration'),
@@ -109,22 +84,9 @@ function _crop_media_provider_form(array &$form, FormStateInterface $form_state)
     '#default_value' => $entity_type->getThirdPartySetting('crop', 'image_field'),
     '#options' => $options,
     '#empty_option' => t('- Skip field -'),
-    '#empty_value' => '_none',
+    '#empty_value' => MediaSourceInterface::METADATA_FIELD_EMPTY,
     '#description' => t('Select field that stores image which needs to be cropped.'),
   ];
-
-  return $form;
-}
-
-/**
- * Entity builder for Media bundle.
- *
- * Adds third party settings to Media bundle config entity.
- *
- * @see crop_form_media_bundle_form_alter()
- */
-function crop_media_bundle_form_builder($entity_type, MediaBundleInterface $bundle, &$form, FormStateInterface $form_state) {
-  $bundle->setThirdPartySetting('crop', 'image_field', $form_state->getValue('image_field'));
 }
 
 /**