Skip to content
Snippets Groups Projects
Commit 51d61fcc authored by rhenck's avatar rhenck
Browse files

Refactor geometry element dependencies

Move deps only used by geometry to the geometry class and out of the 
parent.

DomSanitizer was a relict and no longer in use.
parent edb88d87
No related branches found
No related tags found
No related merge requests found
Pipeline #41733 passed
import { import {
AfterViewInit, Component, EventEmitter, Input, Output AfterViewInit, Component, ElementRef, EventEmitter, Input, Output, Renderer2
} from '@angular/core'; } from '@angular/core';
import { ElementComponent } from 'common/directives/element-component.directive'; import { ElementComponent } from 'common/directives/element-component.directive';
import { GeometryElement } from 'common/models/elements/geometry/geometry'; import { GeometryElement } from 'common/models/elements/geometry/geometry';
import { ValueChangeElement } from 'common/models/elements/element'; import { ValueChangeElement } from 'common/models/elements/element';
import { ExternalResourceService } from 'common/services/external-resource.service';
declare const GGBApplet: any; declare const GGBApplet: any;
...@@ -22,6 +23,12 @@ export class GeometryComponent extends ElementComponent implements AfterViewInit ...@@ -22,6 +23,12 @@ export class GeometryComponent extends ElementComponent implements AfterViewInit
@Input() appDefinition!: string; @Input() appDefinition!: string;
@Output() elementValueChanged = new EventEmitter<ValueChangeElement>(); @Output() elementValueChanged = new EventEmitter<ValueChangeElement>();
constructor(public elementRef: ElementRef,
private renderer: Renderer2,
private externalResourceService: ExternalResourceService) {
super(elementRef);
}
ngAfterViewInit(): void { ngAfterViewInit(): void {
this.externalResourceService.initializeGeoGebra(this.renderer); this.externalResourceService.initializeGeoGebra(this.renderer);
this.externalResourceService.isGeoGebraLoaded().subscribe((isLoaded: boolean) => { this.externalResourceService.isGeoGebraLoaded().subscribe((isLoaded: boolean) => {
......
...@@ -11,10 +11,7 @@ export abstract class ElementComponent implements AfterContentChecked { ...@@ -11,10 +11,7 @@ export abstract class ElementComponent implements AfterContentChecked {
abstract elementModel: UIElement; abstract elementModel: UIElement;
project!: 'player' | 'editor'; project!: 'player' | 'editor';
constructor(public elementRef: ElementRef, constructor(public elementRef: ElementRef) {}
public sanitizer: DomSanitizer,
protected renderer: Renderer2,
protected externalResourceService: ExternalResourceService) {}
get domElement(): Element { get domElement(): Element {
return this.elementRef.nativeElement; return this.elementRef.nativeElement;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment