Commit 09edf8502cd70d3dc48d4ce0554104a6ea75f604

Authored by Igor Kulikov
Committed by GitHub
2 parents 84647a07 96bea446

Merge pull request #4041 from vvlladd28/bug/safary/action-dialog

UI: Fixed show widget action dialog in Safari browser
... ... @@ -67,15 +67,13 @@
67 67 </mat-form-field>
68 68 <section fxLayout="column" [formGroup]="actionTypeFormGroup" [ngSwitch]="widgetActionFormGroup.get('type').value">
69 69 <ng-template [ngSwitchCase]="widgetActionType.openDashboard">
70   - <div fxLayout="column">
71   - <div class="mat-caption tb-required"
72   - style="padding-left: 3px; padding-bottom: 10px; color: rgba(0,0,0,0.57);" translate>widget-action.target-dashboard</div>
73   - <tb-dashboard-autocomplete
74   - formControlName="targetDashboardId"
75   - required
76   - [selectFirstDashboard]="true"
77   - ></tb-dashboard-autocomplete>
78   - </div>
  70 + <div class="mat-caption tb-required"
  71 + style="padding-left: 3px; padding-bottom: 10px; color: rgba(0,0,0,0.57);" translate>widget-action.target-dashboard</div>
  72 + <tb-dashboard-autocomplete
  73 + formControlName="targetDashboardId"
  74 + required
  75 + [selectFirstDashboard]="true"
  76 + ></tb-dashboard-autocomplete>
79 77 </ng-template>
80 78 <ng-template [ngSwitchCase]="widgetActionFormGroup.get('type').value === widgetActionType.openDashboardState ||
81 79 widgetActionFormGroup.get('type').value === widgetActionType.updateDashboardState ||
... ... @@ -122,26 +120,24 @@
122 120 widgetActionFormGroup.get('type').value === widgetActionType.updateDashboardState ||
123 121 widgetActionFormGroup.get('type').value === widgetActionType.openDashboard ?
124 122 widgetActionFormGroup.get('type').value : ''">
125   - <div fxFlex fxLayout="column">
126   - <mat-checkbox formControlName="setEntityId">
127   - {{ 'widget-action.set-entity-from-widget' | translate }}
128   - </mat-checkbox>
129   - <mat-form-field *ngIf="actionTypeFormGroup.get('setEntityId').value"
130   - floatLabel="always"
131   - class="mat-block">
132   - <mat-label translate>alias.state-entity-parameter-name</mat-label>
133   - <input matInput
134   - placeholder="{{ 'alias.default-entity-parameter-name' | translate }}"
135   - formControlName="stateEntityParamName">
136   - </mat-form-field>
137   - </div>
  123 + <mat-checkbox formControlName="setEntityId">
  124 + {{ 'widget-action.set-entity-from-widget' | translate }}
  125 + </mat-checkbox>
  126 + <mat-form-field *ngIf="actionTypeFormGroup.get('setEntityId').value"
  127 + floatLabel="always"
  128 + class="mat-block">
  129 + <mat-label translate>alias.state-entity-parameter-name</mat-label>
  130 + <input matInput
  131 + placeholder="{{ 'alias.default-entity-parameter-name' | translate }}"
  132 + formControlName="stateEntityParamName">
  133 + </mat-form-field>
138 134 </ng-template>
139 135 <ng-template [ngSwitchCase]="widgetActionFormGroup.get('type').value === widgetActionType.openDashboardState ?
140 136 widgetActionFormGroup.get('type').value : ''">
141 137 <mat-checkbox formControlName="openInSeparateDialog">
142 138 {{ 'widget-action.open-in-separate-dialog' | translate }}
143 139 </mat-checkbox>
144   - <section fxLayout="column" *ngIf="actionTypeFormGroup.get('openInSeparateDialog').value">
  140 + <section *ngIf="actionTypeFormGroup.get('openInSeparateDialog').value">
145 141 <mat-form-field class="mat-block">
146 142 <mat-label translate>widget-action.dialog-title</mat-label>
147 143 <input matInput formControlName="dialogTitle">
... ...