Skip to content

Commit

Permalink
Merge branch 'master' of github.com:surveyjs/survey-library into bug/…
Browse files Browse the repository at this point in the history
…6205-popup-height-after-filtering
  • Loading branch information
OlgaLarina committed Jul 18, 2023
2 parents 9ec1036 + bb507a8 commit a35386d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.

## [1.9.98](https://github.com/surveyjs/survey-library/compare/v1.9.97...v1.9.98) (2023-07-18)

## [1.9.97](https://github.com/surveyjs/survey-library/compare/v1.9.96...v1.9.97) (2023-07-12)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"testcafe:ci:angular": "testcafe -c 4 -q attemptLimit=5,successThreshold=1 chrome:headless testCafe/ --app \"http-server ./packages/survey-angular-ui/example/dist --proxy http://localhost:8080? -p 8080\" --selector-timeout 1500 --reporter minimal --env=angular",
"prepare": "husky install"
},
"version": "1.9.97",
"version": "1.9.98",
"name": "survey-library",
"private": true,
"devDependencies": {
Expand Down
2 changes: 2 additions & 0 deletions packages/survey-angular-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.

## [1.9.98](https://github.com/surveyjs/surveyjs/compare/v1.9.97...v1.9.98) (2023-07-18)

## [1.9.97](https://github.com/surveyjs/surveyjs/compare/v1.9.96...v1.9.97) (2023-07-12)


Expand Down
2 changes: 1 addition & 1 deletion packages/survey-angular-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "survey-angular-ui",
"version": "1.9.97",
"version": "1.9.98",
"description": "survey.js is a JavaScript Survey Library. It is a modern way to add a survey to your website. It uses JSON for survey metadata and results.",
"keywords": [
"Survey",
Expand Down
2 changes: 2 additions & 0 deletions src/stylesmanager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ export class StylesManager {
return themeMapper;
}
static getIncludedThemeCss(): Array<any> {
if (typeof settings.environment === "undefined") return [];
const { rootElement }: ISurveyEnvironment = settings.environment;
const themeMapper = StylesManager.getAvailableThemes();

Expand Down Expand Up @@ -324,6 +325,7 @@ export class StylesManager {
}

public static applyTheme(themeName: string = "default", themeSelector?: string): void {
if (typeof settings.environment === "undefined") return;
const { rootElement }: ISurveyEnvironment = settings.environment;
const element = isShadowDOM(rootElement) ? rootElement.host : rootElement;
surveyCss.currentType = themeName;
Expand Down
2 changes: 1 addition & 1 deletion src/svgbundle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class SvgIconRegistry {
}
public renderIcons() {
const containerId = "sv-icon-holder-global-container";
if(!settings.environment.root.getElementById(containerId)) {
if(!!settings.environment && !settings.environment.root.getElementById(containerId)) {
let iconsDiv = document.createElement("div");
iconsDiv.id = containerId;
iconsDiv.innerHTML = "<svg>" + this.iconsRenderedHtml() + "</svg>";
Expand Down

0 comments on commit a35386d

Please sign in to comment.