@@ -12,13 +12,13 @@ discard block |
||
| 12 | 12 | * Implements hook_help(). |
| 13 | 13 | */ |
| 14 | 14 | function media_help($route_name, RouteMatchInterface $route_match) { |
| 15 | - switch ($route_name) { |
|
| 15 | + switch ($route_name) { |
|
| 16 | 16 | // Main module help for the media module. |
| 17 | 17 | case 'help.page.media': |
| 18 | 18 | $output = ''; |
| 19 | - $output .= '<h3>' . t('About') . '</h3>'; |
|
| 20 | - $output .= '<p>' . t('Media module for Drupal 8') . '</p>'; |
|
| 21 | - return $output; |
|
| 19 | + $output .= '<h3>' . t('About') . '</h3>'; |
|
| 20 | + $output .= '<p>' . t('Media module for Drupal 8') . '</p>'; |
|
| 21 | + return $output; |
|
| 22 | 22 | |
| 23 | 23 | default: |
| 24 | 24 | } |
@@ -28,28 +28,28 @@ discard block |
||
| 28 | 28 | * Implements hook_form_alter(). |
| 29 | 29 | */ |
| 30 | 30 | function media_form_alter(&$form, FormStateInterface &$form_state) { |
| 31 | - if (isset($form['#form_id'])) { |
|
| 31 | + if (isset($form['#form_id'])) { |
|
| 32 | 32 | if ($form['#form_id'] == 'entity_browser_media_library_form') { |
| 33 | - // Attach our library. |
|
| 34 | - $form['#attached']['library'][] = 'media/view'; |
|
| 33 | + // Attach our library. |
|
| 34 | + $form['#attached']['library'][] = 'media/view'; |
|
| 35 | 35 | |
| 36 | - // Style the submit button. |
|
| 37 | - $form['actions']['submit']['#value'] = t('Select Media Files'); |
|
| 38 | - $form['actions']['submit']['#attributes']['class'][] = 'button--primary'; |
|
| 39 | - $form['actions']['submit']['#attributes']['class'][] = 'entity-browser-modal-target'; |
|
| 36 | + // Style the submit button. |
|
| 37 | + $form['actions']['submit']['#value'] = t('Select Media Files'); |
|
| 38 | + $form['actions']['submit']['#attributes']['class'][] = 'button--primary'; |
|
| 39 | + $form['actions']['submit']['#attributes']['class'][] = 'entity-browser-modal-target'; |
|
| 40 | 40 | |
| 41 | - // Wrap actions so we can float them at the bottom of the browser. |
|
| 42 | - $form['actions_wrap'] = [ |
|
| 41 | + // Wrap actions so we can float them at the bottom of the browser. |
|
| 42 | + $form['actions_wrap'] = [ |
|
| 43 | 43 | '#type' => 'container', |
| 44 | 44 | '#attributes' => [ |
| 45 | - 'class' => 'file-browser-actions', |
|
| 45 | + 'class' => 'file-browser-actions', |
|
| 46 | 46 | ], |
| 47 | 47 | 0 => $form['actions'], |
| 48 | - ]; |
|
| 49 | - unset($form['actions']); |
|
| 48 | + ]; |
|
| 49 | + unset($form['actions']); |
|
| 50 | 50 | |
| 51 | - // Add a class for generic styling. |
|
| 52 | - $form['#attributes']['class'][] = 'file-browser-form'; |
|
| 51 | + // Add a class for generic styling. |
|
| 52 | + $form['#attributes']['class'][] = 'file-browser-form'; |
|
| 53 | + } |
|
| 53 | 54 | } |
| 54 | - } |
|
| 55 | 55 | } |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | /** |
| 28 | 28 | * Implements hook_form_alter(). |
| 29 | 29 | */ |
| 30 | -function media_form_alter(&$form, FormStateInterface &$form_state) { |
|
| 30 | +function media_form_alter(&$form, FormStateInterface & $form_state) { |
|
| 31 | 31 | if (isset($form['#form_id'])) { |
| 32 | 32 | if ($form['#form_id'] == 'entity_browser_media_library_form') { |
| 33 | 33 | // Attach our library. |
@@ -197,7 +197,4 @@ |
||
| 197 | 197 | $item = $this->container->get('entity_type.manager') |
| 198 | 198 | ->getStorage('media') |
| 199 | 199 | ->loadUnchanged($id); |
| 200 | - return $item; |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | -} |
|
| 200 | + return $item |
|
| 204 | 201 | \ No newline at end of file |
@@ -197,7 +197,4 @@ |
||
| 197 | 197 | $item = $this->container->get('entity_type.manager') |
| 198 | 198 | ->getStorage('media') |
| 199 | 199 | ->loadUnchanged($id); |
| 200 | - return $item; |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | -} |
|
| 200 | + return $item |
|
| 204 | 201 | \ No newline at end of file |
@@ -197,7 +197,4 @@ |
||
| 197 | 197 | $item = $this->container->get('entity_type.manager') |
| 198 | 198 | ->getStorage('media') |
| 199 | 199 | ->loadUnchanged($id); |
| 200 | - return $item; |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | -} |
|
| 200 | + return $item |
|
| 204 | 201 | \ No newline at end of file |
@@ -197,7 +197,4 @@ |
||
| 197 | 197 | $item = $this->container->get('entity_type.manager') |
| 198 | 198 | ->getStorage('media') |
| 199 | 199 | ->loadUnchanged($id); |
| 200 | - return $item; |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | -} |
|
| 200 | + return $item |
|
| 204 | 201 | \ No newline at end of file |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | * @group media |
| 11 | 11 | */ |
| 12 | 12 | class GalleryBundleTest extends WebTestBase { |
| 13 | -<<<<<<< HEAD |
|
| 13 | +<< << <<< HEAD |
|
| 14 | 14 | /** |
| 15 | 15 | * Exempt from strict schema checking. |
| 16 | 16 | * |
@@ -197,7 +197,4 @@ discard block |
||
| 197 | 197 | $item = $this->container->get('entity_type.manager') |
| 198 | 198 | ->getStorage('media') |
| 199 | 199 | ->loadUnchanged($id); |
| 200 | - return $item; |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | -} |
|
| 200 | + return $item |
|
| 204 | 201 | \ No newline at end of file |
@@ -197,7 +197,4 @@ |
||
| 197 | 197 | $item = $this->container->get('entity_type.manager') |
| 198 | 198 | ->getStorage('media') |
| 199 | 199 | ->loadUnchanged($id); |
| 200 | - return $item; |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | -} |
|
| 200 | + return $item |
|
| 204 | 201 | \ No newline at end of file |
@@ -197,7 +197,4 @@ |
||
| 197 | 197 | $item = $this->container->get('entity_type.manager') |
| 198 | 198 | ->getStorage('media') |
| 199 | 199 | ->loadUnchanged($id); |
| 200 | - return $item; |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | -} |
|
| 200 | + return $item |
|
| 204 | 201 | \ No newline at end of file |