diff --git a/package-lock.json b/package-lock.json index 8a2a27097f..36646b92bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,6 @@ "@ngx-translate/http-loader": "^7.0.0", "@rx-angular/state": "1.6.0", "@sentry/browser": "^6.19.2", - "@trademe/ng-defer-load": "^8.2.1", "angular-oauth2-oidc": "13.0.1", "angular2-uuid": "^1.1.1", "angulartics2": "^12.0.0", @@ -6370,26 +6369,6 @@ "node": ">= 10" } }, - "node_modules/@trademe/ng-defer-load": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@trademe/ng-defer-load/-/ng-defer-load-8.2.1.tgz", - "integrity": "sha512-AvbG+dXCOssT/FE+iokpvcr+VFgLVLfVGM1BhFpmXwffaGmw/B2AUke/r5OuIPD1IWwQA2flTnZOKc+jOYXDRg==", - "dependencies": { - "tslib": "^1.9.0" - }, - "peerDependencies": { - "@angular/common": ">=8.0.0", - "@angular/core": ">=8.0.0", - "@angular/platform-browser": ">=8.0.0", - "rxjs": "^6.4.0", - "zone.js": ">=0.9.1" - } - }, - "node_modules/@trademe/ng-defer-load/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@ts-morph/common": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.13.0.tgz", @@ -33187,21 +33166,6 @@ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==" }, - "@trademe/ng-defer-load": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@trademe/ng-defer-load/-/ng-defer-load-8.2.1.tgz", - "integrity": "sha512-AvbG+dXCOssT/FE+iokpvcr+VFgLVLfVGM1BhFpmXwffaGmw/B2AUke/r5OuIPD1IWwQA2flTnZOKc+jOYXDRg==", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } - }, "@ts-morph/common": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.13.0.tgz", diff --git a/package.json b/package.json index c01f22b78d..20b97faee2 100644 --- a/package.json +++ b/package.json @@ -86,13 +86,12 @@ "@ngx-translate/http-loader": "^7.0.0", "@rx-angular/state": "1.6.0", "@sentry/browser": "^6.19.2", - "@trademe/ng-defer-load": "^8.2.1", "angular-oauth2-oidc": "13.0.1", "angular2-uuid": "^1.1.1", "angulartics2": "^12.0.0", "bootstrap": "^4.6.1", - "express": "^4.17.3", "date-fns": "^2.28.0", + "express": "^4.17.3", "express-http-proxy": "^1.6.3", "express-robots-txt": "1.0.0", "file-replace-loader": "^1.4.0", diff --git a/src/app/pages/category/category-image/category-image.component.html b/src/app/pages/category/category-image/category-image.component.html index e2a5eea541..c0499f1cd1 100644 --- a/src/app/pages/category/category-image/category-image.component.html +++ b/src/app/pages/category/category-image/category-image.component.html @@ -1,3 +1,3 @@ -
- +
+
diff --git a/src/app/pages/category/category-image/category-image.component.spec.ts b/src/app/pages/category/category-image/category-image.component.spec.ts index 57d6c25253..4d53c4506a 100644 --- a/src/app/pages/category/category-image/category-image.component.spec.ts +++ b/src/app/pages/category/category-image/category-image.component.spec.ts @@ -9,12 +9,6 @@ describe('Category Image Component', () => { let element: HTMLElement; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [CategoryImageComponent], - }).compileComponents(); - }); - beforeEach(() => { fixture = TestBed.createComponent(CategoryImageComponent); component = fixture.componentInstance; @@ -31,7 +25,6 @@ describe('Category Image Component', () => { ], } as Category; component.category = category; - component.showImage = true; component.ngOnChanges(); fixture.detectChanges(); }); diff --git a/src/app/pages/category/category-image/category-image.component.ts b/src/app/pages/category/category-image/category-image.component.ts index 04518c83db..b0adbf86b0 100644 --- a/src/app/pages/category/category-image/category-image.component.ts +++ b/src/app/pages/category/category-image/category-image.component.ts @@ -18,11 +18,6 @@ export class CategoryImageComponent implements OnChanges { categoryImageUrl = '/assets/img/not_available.png'; - /** - * deferred loading flag - */ - showImage = false; - ngOnChanges() { this.setCategoryImageUrl(); } diff --git a/src/app/shared/cms/components/cms-image-enhanced/cms-image-enhanced.component.html b/src/app/shared/cms/components/cms-image-enhanced/cms-image-enhanced.component.html index 0f63b228cf..8d479dda5a 100644 --- a/src/app/shared/cms/components/cms-image-enhanced/cms-image-enhanced.component.html +++ b/src/app/shared/cms/components/cms-image-enhanced/cms-image-enhanced.component.html @@ -12,12 +12,8 @@ -
- +
+ -
- +
+
diff --git a/src/app/shared/cms/components/cms-image/cms-image.component.spec.ts b/src/app/shared/cms/components/cms-image/cms-image.component.spec.ts index 4874cfeabe..0c66852bdc 100644 --- a/src/app/shared/cms/components/cms-image/cms-image.component.spec.ts +++ b/src/app/shared/cms/components/cms-image/cms-image.component.spec.ts @@ -33,7 +33,6 @@ describe('Cms Image Component', () => { }, }; component.pagelet = createContentPageletView(pagelet); - component.showImage = true; }); it('should be created', () => { @@ -42,8 +41,8 @@ describe('Cms Image Component', () => { expect(() => fixture.detectChanges()).not.toThrow(); expect(element).toMatchInlineSnapshot(`
- foo
+ foo
`); }); diff --git a/src/app/shared/cms/components/cms-image/cms-image.component.ts b/src/app/shared/cms/components/cms-image/cms-image.component.ts index 7bdde3a3ec..4fa30bdd51 100644 --- a/src/app/shared/cms/components/cms-image/cms-image.component.ts +++ b/src/app/shared/cms/components/cms-image/cms-image.component.ts @@ -14,9 +14,4 @@ export class CMSImageComponent implements CMSComponent { isRouterLink = ContentViewHelper.isRouterLink; routerLink = ContentViewHelper.getRouterLink; - - /** - * deferred loading flag - */ - showImage = false; } diff --git a/src/app/shared/cms/components/cms-video/cms-video.component.html b/src/app/shared/cms/components/cms-video/cms-video.component.html index 889af60c8a..b21901abf9 100644 --- a/src/app/shared/cms/components/cms-video/cms-video.component.html +++ b/src/app/shared/cms/components/cms-video/cms-video.component.html @@ -1,20 +1,18 @@
-
+
- +