Revert "add elementType img"

This reverts commit d8adfdb.
SAP · Oct 17, 2024 · d29bbcb · d29bbcb
1 parent 01e885c
commit d29bbcb
Show file tree

Hide file tree

Showing 28 changed files with 84 additions and 439 deletions.
diff --git a/...360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.html b/...360/components/asm-customer-360-product-item/asm-customer-360-product-item.component.html
@@ -4,14 +4,6 @@
  (click)="selectProduct.emit(product)"
 >
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="product?.images?.PRIMARY"
- format="product"
- [elementType]="'img'"
- [alt]="product?.name ?? ''"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="product?.images?.PRIMARY"
  format="product"
  [alt]="product?.name ?? ''"

diff --git a/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.html b/feature-libs/asm/customer-360/components/asm-customer-360/asm-customer-360.component.html
@@ -38,15 +38,7 @@ <h3 id="asm-customer-360-title" class="modal-title">
  "
  >
  <div class="cx-avatar-image">
- <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="avatarImage"
- [elementType]="'img'"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
- [container]="avatarImage"
- ></cx-media>
+ <cx-media [container]="avatarImage"></cx-media>
  </div>
  </ng-container>
 

diff --git a/...ibs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html b/...ibs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html
@@ -14,13 +14,6 @@
  tabindex="0"
  >
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [elementType]="'img'"
- [container]="item.product?.images?.PRIMARY"
- format="cartIcon"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="item.product?.images?.PRIMARY"
  format="cartIcon"
  ></cx-media>

diff --git a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.html b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.html
@@ -12,13 +12,6 @@
  tabindex="0"
  >
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="item.product?.images?.PRIMARY"
- [elementType]="'img'"
- format="cartIcon"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="item.product?.images?.PRIMARY"
  format="cartIcon"
  ></cx-media>

diff --git a/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html b/feature-libs/cart/quick-order/components/quick-order/form/quick-order-form.component.html
@@ -82,29 +82,14 @@
  class="quick-order-results-product"
  role="option"
  >
- <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
- <cx-media
- *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
- [elementType]="'img'"
- [alt]="product.name"
- [container]="product.images?.PRIMARY"
- class="media"
- format="thumbnail"
- role="presentation"
- ></cx-media>
- </ng-container>
-
- <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
- <cx-media
- *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
- [alt]="product.name"
- [container]="product.images?.PRIMARY"
- class="media"
- format="thumbnail"
- role="presentation"
- ></cx-media>
- </ng-container>
-
+ <cx-media
+ *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
+ [alt]="product.name"
+ [container]="product.images?.PRIMARY"
+ class="media"
+ format="thumbnail"
+ role="presentation"
+ ></cx-media>
  <div class="name" [innerHTML]="product.name"></div>
  <span class="id">
  {{
@@ -154,31 +139,14 @@
  class="quick-order-results-product"
  role="option"
  >
- <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
- <cx-media
- *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
- [alt]="product.name"
- [elementType]="'img'"
- [container]="product.images?.PRIMARY"
- class="media"
- format="thumbnail"
- role="presentation"
- ></cx-media>
- </ng-container>
-
- <ng-container
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
- >
- <cx-media
- *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
- [alt]="product.name"
- [container]="product.images?.PRIMARY"
- class="media"
- format="thumbnail"
- role="presentation"
- ></cx-media>
- </ng-container>
-
+ <cx-media
+ *ngIf="config?.quickOrder?.searchForm?.displayProductImages"
+ [alt]="product.name"
+ [container]="product.images?.PRIMARY"
+ class="media"
+ format="thumbnail"
+ role="presentation"
+ ></cx-media>
  <div class="name" [innerHTML]="product.name"></div>
  <span class="id">
  {{

diff --git a/...e-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.html b/...e-libs/cart/quick-order/components/quick-order/table/item/quick-order-item.component.html
@@ -9,15 +9,6 @@
  tabindex="-1"
  >
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="entry?.product?.images?.PRIMARY"
- [elementType]="'img'"
- [alt]="entry?.product?.name"
- format="cartIcon"
- ></cx-media>
-
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="entry?.product?.images?.PRIMARY"
  [alt]="entry?.product?.name"
  format="cartIcon"

diff --git a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.html b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.html
@@ -6,13 +6,6 @@
  tabindex="-1"
  >
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="cartEntry.product?.images?.PRIMARY"
- [elementType]="'img'"
- format="thumbnail"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="cartEntry.product?.images?.PRIMARY"
  format="thumbnail"
  ></cx-media>

diff --git a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.html b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.html
@@ -54,13 +54,6 @@
  <td role="cell">
  <div class="cx-table-item-container">
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="item.product.images?.PRIMARY"
- [elementType]="'img'"
- format="thumbnail"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="item.product.images?.PRIMARY"
  format="thumbnail"
  ></cx-media>

diff --git a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.html b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.html
@@ -60,15 +60,6 @@
  <div class="cx-my-account-view-order-column-1">
  <div class="cx-my-account-view-order-column-1-image">
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="product.images?.PRIMARY"
- [elementType]="'img'"
- class="cx-my-account-view-order-img"
- format="thumbnail"
- role="presentation"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="product.images?.PRIMARY"
  class="cx-my-account-view-order-img"
  format="thumbnail"

diff --git a/...t-v2/consolidated-information/my-account-v2-order-consolidated-information.component.html b/...t-v2/consolidated-information/my-account-v2-order-consolidated-information.component.html
@@ -193,15 +193,6 @@
  <ng-container *ngIf="order.entries">
  <ng-container *ngFor="let item of getProductImages(order.entries)">
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [elementType]="'img'"
- [container]="item.PRIMARY"
- class="cx-order-img"
- format="thumbnail"
- role="presentation"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="item.PRIMARY"
  class="cx-order-img"
  format="thumbnail"

diff --git a/...components/return-request-detail/return-request-items/return-request-items.component.html b/...components/return-request-detail/return-request-items/return-request-items.component.html
@@ -34,13 +34,6 @@
  <!-- Item Image -->
  <div class="cx-table-item-container">
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [elementType]="'img'"
- [container]="returnEntry.orderEntry?.product.images?.PRIMARY"
- format="thumbnail"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="returnEntry.orderEntry?.product.images?.PRIMARY"
  format="thumbnail"
  ></cx-media>

diff --git a/...up-in-store/components/container/pickup-items-details/pickup-items-details.component.html b/...up-in-store/components/container/pickup-items-details/pickup-items-details.component.html
@@ -61,13 +61,6 @@
  <div class="col-2 cx-image-container col-offset-1">
  <a tabindex="0">
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [elementType]="'img'"
- [container]="item.product?.images?.PRIMARY"
- format="cartIcon"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="item.product?.images?.PRIMARY"
  format="cartIcon"
  ></cx-media>

diff --git a/...ased/components/attribute/product-card/configurator-attribute-product-card.component.html b/...ased/components/attribute/product-card/configurator-attribute-product-card.component.html
@@ -15,14 +15,6 @@
  <div class="cx-product-card-rows">
  <div class="cx-product-card-imgs">
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [elementType]="'img'"
- [container]="product.images?.PRIMARY"
- format="product"
- aria-hidden="true"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="product.images?.PRIMARY"
  format="product"
  aria-hidden="true"

diff --git a/...omponents/overview-bundle-attribute/configurator-overview-bundle-attribute.component.html b/...omponents/overview-bundle-attribute/configurator-overview-bundle-attribute.component.html
@@ -2,14 +2,6 @@
  <div class="cx-value-container">
  <div class="cx-thumbnail">
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="getProductPrimaryImage(product)"
- [elementType]="'img'"
- format="product"
- aria-hidden="true"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="getProductPrimaryImage(product)"
  format="product"
  aria-hidden="true"

diff --git a/...configurator/rulebased/components/product-title/configurator-product-title.component.html b/...configurator/rulebased/components/product-title/configurator-product-title.component.html
@@ -35,13 +35,6 @@
  <div class="cx-details" [class.open]="showMore">
  <div class="cx-details-image" aria-hidden="true">
  <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="product?.images?.PRIMARY"
- format="product"
- [elementType]="'img'"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
  [container]="product?.images?.PRIMARY"
  format="product"
  ></cx-media>

diff --git a/...imensional/selector/components/selector/product-multi-dimensional-selector.component.html b/...imensional/selector/components/selector/product-multi-dimensional-selector.component.html
@@ -21,17 +21,7 @@
  (click)="changeVariant(option.code)"
  [cxFocus]="{ key: option.code }"
  >
- <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="option.image"
- role="img"
- [elementType]="'img'"
- />
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
- [container]="option.image"
- role="img"
- />
+ <cx-media [container]="option.image" role="img" />
  </button>
  </div>
  </div>

diff --git a/...e-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.html b/...e-zoom/product-image-zoom-product-images/product-image-zoom-product-images.component.html
@@ -1,15 +1,5 @@
 <ng-container *ngIf="mainImage$ | async as main">
- <cx-media
- *cxFeature="'useExtendedMediaComponentConfiguration'"
- [container]="main"
- (click)="triggerZoom(true)"
- [elementType]="'img'"
- ></cx-media>
- <cx-media
- *cxFeature="'!useExtendedMediaComponentConfiguration'"
- [container]="main"
- (click)="triggerZoom(true)"
- ></cx-media>
+ <cx-media [container]="main" (click)="triggerZoom(true)"></cx-media>
  <cx-product-image-zoom-trigger
  [expandImage]="expandImage.value"
  [galleryIndex]="selectedIndex"
@@ -36,49 +26,23 @@
 </ng-container>
 
 <ng-template #thumb let-item="item">
- <ng-container *cxFeature="'useExtendedMediaComponentConfiguration'">
- <cx-media
- *cxFeature="'a11yCarouselArrowKeysNavigation'"
- [elementType]="'img'"
- cxFocusableCarouselItem
- [container]="item.container"
- tabindex="0"
- (focus)="openImage(item.container)"
- [class.is-active]="isActive(item.container) | async"
- format="product"
- >
- </cx-media>
- <cx-media
- *cxFeature="'!a11yCarouselArrowKeysNavigation'"
- [elementType]="'img'"
- [container]="item.container"
- tabindex="0"
- (focus)="openImage(item.container)"
- [class.is-active]="isActive(item.container) | async"
- format="product"
- >
- </cx-media>
- </ng-container>
-
- <ng-container *cxFeature="'!useExtendedMediaComponentConfiguration'">
- <cx-media
- *cxFeature="'a11yCarouselArrowKeysNavigation'"
- cxFocusableCarouselItem
- [container]="item.container"
- tabindex="0"
- (focus)="openImage(item.container)"
- [class.is-active]="isActive(item.container) | async"
- format="product"
- >
- </cx-media>
- <cx-media
- *cxFeature="'!a11yCarouselArrowKeysNavigation'"
- [container]="item.container"
- tabindex="0"
- (focus)="openImage(item.container)"
- [class.is-active]="isActive(item.container) | async"
- format="product"
- >
- </cx-media>
- </ng-container>
+ <cx-media
+ *cxFeature="'a11yCarouselArrowKeysNavigation'"
+ cxFocusableCarouselItem
+ [container]="item.container"
+ tabindex="0"
+ (focus)="openImage(item.container)"
+ [class.is-active]="isActive(item.container) | async"
+ format="product"
+ >
+ </cx-media>
+ <cx-media
+ *cxFeature="'!a11yCarouselArrowKeysNavigation'"
+ [container]="item.container"
+ tabindex="0"
+ (focus)="openImage(item.container)"
+ [class.is-active]="isActive(item.container) | async"
+ format="product"
+ >
+ </cx-media>
 </ng-template>