-
Notifications
You must be signed in to change notification settings - Fork 776
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:surveyjs/survey-library into bug/…
…6205-popup-height-after-filtering
- Loading branch information
Showing
157 changed files
with
3,788 additions
and
1,456 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
function init() { | ||
//disable observer for survey to prevent loop limited exceptions | ||
Survey.defaultStandardCss.variables.mobileWidth = undefined; | ||
Survey.StylesManager.applyTheme("default"); | ||
} | ||
document.addEventListener("DOMContentLoaded", init); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
function init() { | ||
//disable observer for survey to prevent loop limited exceptions | ||
Survey.modernCss.variables.mobileWidth = undefined; | ||
} | ||
document.addEventListener("DOMContentLoaded", init); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 4 additions & 6 deletions
10
packages/survey-angular-ui/src/questions/matrix-row.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,7 @@ | ||
<ng-template #template> | ||
<tr [class]="model.className" (pointerdown)="question.onPointerDown($event, row)" [attr.data-sv-drop-target-matrix-row]="row && row.id"> | ||
<sv-ng-matrix-cell | ||
[cell]="cell" | ||
[question]="question" | ||
*ngFor="let cell of model.cells; trackBy: trackCellBy" | ||
></sv-ng-matrix-cell> | ||
<tr *ngIf="model.visible" [class]="model.className" (pointerdown)="question.onPointerDown($event, row)" | ||
[attr.data-sv-drop-target-matrix-row]="row && row.id"> | ||
<sv-ng-matrix-cell [cell]="cell" [question]="question" | ||
*ngFor="let cell of model.cells; trackBy: trackCellBy"></sv-ng-matrix-cell> | ||
</tr> | ||
</ng-template> |
45 changes: 24 additions & 21 deletions
45
packages/survey-angular-ui/src/questions/matrixcell.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,41 @@ | ||
<ng-template #template> | ||
<td [class]="cell.className" [attr.data-responsive-title]="getHeaders()" [title]="cell.getTitle()" [style]="getCellStyle()" [attr.colspan]="cell.colSpans" #cellContainer> | ||
<sv-ng-matrix-drag-drop-icon *ngIf="cell.isDragHandlerCell" [model]="$any({ data: { row: row, question: question } })"></sv-ng-matrix-drag-drop-icon> | ||
<td [class]="cell.className" [attr.data-responsive-title]="getHeaders()" [title]="cell.getTitle()" | ||
[style]="getCellStyle()" [attr.colspan]="cell.colSpans" #cellContainer> | ||
<sv-ng-matrix-drag-drop-icon *ngIf="cell.isDragHandlerCell" | ||
[model]="$any({ data: { row: row, question: question } })"></sv-ng-matrix-drag-drop-icon> | ||
<sv-action-bar *ngIf="cell.isActionsCell" [model]="cell.item.getData()" [handleClick]="false"></sv-action-bar> | ||
<ng-container *ngIf="cell.hasPanel"> | ||
<ng-template [component]="{ name: panelComponentName, data: panelComponentData }"></ng-template> | ||
</ng-container> | ||
<div *ngIf="cell.hasQuestion" [class]="question.cssClasses.cellQuestionWrapper" [visible]="cell.question.isVisible"> | ||
<div *ngIf="cell.showErrorOnTop && cell.question.hasVisibleErrors" [element]="cell.question" [location]="'top'" sv-ng-errors></div> | ||
<div *ngIf="cell.isErrorsCell && cell.question?.hasVisibleErrors" [element]="cell.question" sv-ng-errors></div> | ||
<div *ngIf="cell.hasQuestion" [class]="question.cssClasses.cellQuestionWrapper" | ||
[visible]="cell.question.isVisible"> | ||
<ng-container *ngIf="!cell.isChoice && cell.question.isDefaultRendering()"> | ||
<ng-template [component]="{ name: question.getCellWrapperComponentName(cell.cell), data: { componentData: question.getCellWrapperComponentData(cell.cell)} }"> | ||
<ng-template [component]="{ name: getComponentName(cell.question), data: { model: cell.question } }"></ng-template> | ||
</ng-template> | ||
<ng-template | ||
[component]="{ name: question.getCellWrapperComponentName(cell.cell), data: { componentData: question.getCellWrapperComponentData(cell.cell)} }"> | ||
<ng-template | ||
[component]="{ name: getComponentName(cell.question), data: { model: cell.question } }"></ng-template> | ||
</ng-template> | ||
</ng-container> | ||
<ng-template *ngIf="!cell.isChoice && !cell.question.isDefaultRendering()" [component]="{ name: cell.question.getComponentName(), data: { model: cell.question } }"> | ||
<ng-template *ngIf="!cell.isChoice && !cell.question.isDefaultRendering()" | ||
[component]="{ name: cell.question.getComponentName(), data: { model: cell.question } }"> | ||
</ng-template> | ||
<ng-container *ngIf="cell.isItemChoice"> | ||
<ng-template [component]="{ name: question.getCellWrapperComponentName(cell.cell), data: { componentData: question.getCellWrapperComponentData(cell.cell)} }"> | ||
<sv-ng-selebase-item | ||
[showLabel]="false" | ||
[inputType]="cell.isCheckbox ? 'checkbox': 'radio'" | ||
[question]="cell.question" | ||
[model]="cell.item" | ||
></sv-ng-selebase-item> | ||
<ng-template | ||
[component]="{ name: question.getCellWrapperComponentName(cell.cell), data: { componentData: question.getCellWrapperComponentData(cell.cell)} }"> | ||
<sv-ng-selebase-item [showLabel]="false" [inputType]="cell.isCheckbox ? 'checkbox': 'radio'" | ||
[question]="cell.question" [model]="cell.item"></sv-ng-selebase-item> | ||
</ng-template> | ||
</ng-container> | ||
<div *ngIf="cell.isOtherChoice" [class]="cell.question.getCommentAreaCss(true)" [question]="cell.question" sv-ng-comment-other></div> | ||
<div *ngIf="cell.showErrorOnBottom && cell.question.hasVisibleErrors" [element]="cell.question" [location]="'top'" sv-ng-errors></div> | ||
<div *ngIf="cell.question.isErrorsModeTooltip && cell.question.hasVisibleErrors" [element]="cell.question" [location]="'tooltip'" sv-ng-errors></div> | ||
<div *ngIf="cell.isOtherChoice" [class]="cell.question.getCommentAreaCss(true)" [question]="cell.question" | ||
sv-ng-comment-other></div> | ||
</div> | ||
<ng-container *ngIf="cell.hasTitle"> | ||
<ng-template [component]="{ name: question.getCellWrapperComponentName($any(cell)), data: { componentData: question.getCellWrapperComponentData($any(cell))} }"> | ||
<ng-template | ||
[component]="{ name: question.getCellWrapperComponentName($any(cell)), data: { componentData: question.getCellWrapperComponentData($any(cell))} }"> | ||
<sv-ng-string [model]="cell.locTitle"></sv-ng-string> | ||
<span *ngIf="!!cell.requiredText" [class]="question.cssClasses.cellRequiredText">{{ cell.requiredText }}</span> | ||
<span *ngIf="!!cell.requiredText" [class]="question.cssClasses.cellRequiredText">{{ cell.requiredText }}</span> | ||
</ng-template> | ||
</ng-container> | ||
</td> | ||
</td> | ||
</ng-template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -94,6 +94,7 @@ | |
|
||
.sv-list__item-icon { | ||
float: left; | ||
flex-shrink: 0; | ||
width: calcSize(3); | ||
height: calcSize(3); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.