Browse Source
Merge pull request #4119 from vvlladd28/improvement/js-json-editor/fullscrean
UI: Added to js/JSON editor always working fullscreen button
pull/4190/head
Igor Kulikov
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
20 additions and
12 deletions
-
ui-ngx/src/app/shared/components/js-func.component.html
-
ui-ngx/src/app/shared/components/json-content.component.html
|
|
|
@ -24,12 +24,16 @@ |
|
|
|
<button type='button' *ngIf="!disabled" mat-button class="tidy" (click)="beautifyJs()"> |
|
|
|
{{'js-func.tidy' | translate }} |
|
|
|
</button> |
|
|
|
<button type='button' mat-button mat-icon-button (click)="fullscreen = !fullscreen" |
|
|
|
class="tb-mat-32" |
|
|
|
matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}" |
|
|
|
matTooltipPosition="above"> |
|
|
|
<mat-icon class="material-icons">{{ fullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> |
|
|
|
</button> |
|
|
|
<fieldset style="width: initial"> |
|
|
|
<div matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}" |
|
|
|
matTooltipPosition="above" |
|
|
|
style="border-radius: 50%" |
|
|
|
(click)="fullscreen = !fullscreen"> |
|
|
|
<button type='button' mat-button mat-icon-button class="tb-mat-32"> |
|
|
|
<mat-icon class="material-icons">{{ fullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> |
|
|
|
</button> |
|
|
|
</div> |
|
|
|
</fieldset> |
|
|
|
</div> |
|
|
|
<div id="tb-javascript-panel" class="tb-js-func-panel" fxLayout="column" tb-toast toastTarget="{{toastTargetId}}"> |
|
|
|
<div #javascriptEditor id="tb-javascript-input" [ngClass]="{'fill-height': fillHeight}"></div> |
|
|
|
|
|
|
|
@ -29,12 +29,16 @@ |
|
|
|
mat-button *ngIf="!readonly && !disabled" class="tidy" (click)="minifyJSON()"> |
|
|
|
{{'js-func.mini' | translate }} |
|
|
|
</button> |
|
|
|
<button type='button' mat-button mat-icon-button (click)="fullscreen = !fullscreen" |
|
|
|
class="tb-mat-32" |
|
|
|
matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}" |
|
|
|
matTooltipPosition="above"> |
|
|
|
<mat-icon class="material-icons">{{ fullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> |
|
|
|
</button> |
|
|
|
<fieldset style="width: initial"> |
|
|
|
<div matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}" |
|
|
|
matTooltipPosition="above" |
|
|
|
style="border-radius: 50%" |
|
|
|
(click)="fullscreen = !fullscreen"> |
|
|
|
<button type='button' mat-button mat-icon-button class="tb-mat-32"> |
|
|
|
<mat-icon class="material-icons">{{ fullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> |
|
|
|
</button> |
|
|
|
</div> |
|
|
|
</fieldset> |
|
|
|
</div> |
|
|
|
<div id="tb-json-panel" tb-toast toastTarget="{{toastTargetId}}" |
|
|
|
class="tb-json-content-panel" fxLayout="column"> |
|
|
|
|
