From fd916501de1723d884ea9b78e5bca8ca805bd796 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Fri, 13 Jul 2018 16:36:36 +0200 Subject: [PATCH] fixed an issue where the server-side would crash if the page contained nouislider --- package.json | 2 +- .../search-range-filter.component.html | 5 ++++- .../search-range-filter.component.ts | 11 ++++++++++- yarn.lock | 6 +++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f305f319ab..5fa2713295 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "methods": "1.1.2", "moment": "^2.22.1", "morgan": "1.9.0", - "ng2-nouislider": "1.7.8", + "ng2-nouislider": "^1.7.11", "ngx-pagination": "3.0.3", "nouislider": "^11.0.0", "pem": "1.12.3", diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html index a3ee3e436b..c20cc750b7 100644 --- a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html +++ b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html @@ -16,8 +16,11 @@ + + + @@ -32,4 +35,4 @@ - \ No newline at end of file + diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts index 790ec93453..c8ea8c7587 100644 --- a/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts +++ b/src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts @@ -1,4 +1,5 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { isPlatformBrowser } from '@angular/common'; +import { Component, Inject, OnInit, PLATFORM_ID } from '@angular/core'; import { FilterType } from '../../../search-service/filter-type.model'; import { renderFacetFor } from '../search-filter-type-decorator'; import { SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component'; @@ -36,6 +37,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple protected router: Router, @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig, @Inject(SELECTED_VALUES) public selectedValues: string[], + @Inject(PLATFORM_ID) private platformId: any, private route: ActivatedRoute) { super(searchService, filterService, router, filterConfig, selectedValues); } @@ -83,4 +85,11 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple } } + /** + * TODO when upgrading nouislider, verify that this check is still needed. + */ + shouldShowSlider(): boolean { + return isPlatformBrowser(this.platformId); + } + } diff --git a/yarn.lock b/yarn.lock index fd03a7c8ed..14db817837 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5591,9 +5591,9 @@ netmask@~1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35" -ng2-nouislider@1.7.8: - version "1.7.8" - resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.7.8.tgz#5fd6de120f9ca5b5d9c4b377f884944b74c06855" +ng2-nouislider@^1.7.11: + version "1.7.11" + resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.7.11.tgz#b8ba5e3d2ffc23e1e32dfe54dd1726e2b4be316b" ngrx-store-freeze@^0.2.1: version "0.2.1"