Browse Source

UI: Fixed not load advanced settings in widget

pull/5496/head
Vladyslav_Prykhodko 5 years ago
parent
commit
df08320eea
  1. 5
      ui-ngx/src/app/shared/components/json-form/react/json-form-ace-editor.tsx
  2. 2
      ui-ngx/src/app/shared/models/ace/ace.models.ts

5
ui-ngx/src/app/shared/components/json-form/react/json-form-ace-editor.tsx

@ -20,16 +20,15 @@ import Button from '@material-ui/core/Button';
import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
import { IEditorProps } from 'react-ace/src/types';
import { mergeMap } from 'rxjs/operators';
import { loadAceDependencies } from '@shared/models/ace/ace.models';
import { getAce } from '@shared/models/ace/ace.models';
import { from } from 'rxjs';
import { Observable } from 'rxjs/internal/Observable';
import { CircularProgress, IconButton } from '@material-ui/core';
import { MouseEvent } from 'react';
import { Help, HelpOutline } from '@material-ui/icons';
import { position } from 'html2canvas/dist/types/css/property-descriptors/position';
const ReactAce = React.lazy(() => {
return loadAceDependencies().pipe(
return getAce().pipe(
mergeMap(() => {
return from(import('react-ace'));
})

2
ui-ngx/src/app/shared/models/ace/ace.models.ts

@ -22,7 +22,7 @@ import { map, mergeMap, tap } from 'rxjs/operators';
let aceDependenciesLoaded = false;
let aceModule: any;
export function loadAceDependencies(): Observable<any> {
function loadAceDependencies(): Observable<any> {
if (aceDependenciesLoaded) {
return of(null);
} else {

Loading…
Cancel
Save