honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: "toggle origin" can not apply to the children of translation result

Browse Source 
refactor: extract to standalone functions
This commit is contained in:
Zhicheng Wang 2017-08-08 21:29:23 +08:00
parent ace9bf9ace
commit a70679fb5a
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
aio/src/app/layout/doc-viewer/doc-viewer.component.ts
View File

@ -50,7 +50,7 @@ export class DocViewerComponent implements DoCheck, OnDestroy {
this.hostElement = elementRef.nativeElement; this.hostElement = elementRef.nativeElement;
// Security: the initialDocViewerContent comes from the prerendered DOM and is considered to be secure // Security: the initialDocViewerContent comes from the prerendered DOM and is considered to be secure
this.hostElement.innerHTML = initialDocViewerContent; this.hostElement.innerHTML = initialDocViewerContent;
this.swapOriginAndResult(this.hostElement); swapOriginAndResult(this.hostElement);
for (const component of embeddedComponents.components) { for (const component of embeddedComponents.components) {
const factory = componentFactoryResolver.resolveComponentFactory(component); const factory = componentFactoryResolver.resolveComponentFactory(component);
@ -77,7 +77,7 @@ export class DocViewerComponent implements DoCheck, OnDestroy {
// security: the doc.content is always authored by the documentation team // security: the doc.content is always authored by the documentation team
// and is considered to be safe // and is considered to be safe
this.hostElement.innerHTML = doc.contents || ''; this.hostElement.innerHTML = doc.contents || '';
this.swapOriginAndResult(this.hostElement); swapOriginAndResult(this.hostElement);
if (!doc.contents) { if (!doc.contents) {
return; return;
@ -142,7 +142,7 @@ export class DocViewerComponent implements DoCheck, OnDestroy {
@HostListener('click', ['$event']) @HostListener('click', ['$event'])
toggleTranslationOrigin($event: MouseEvent): void { toggleTranslationOrigin($event: MouseEvent): void {
const element = $event.target as Element; const element = findTranslationResult($event.target as Element);
if (element.hasAttribute('translation-result')) { if (element.hasAttribute('translation-result')) {
const origin = element.nextElementSibling; const origin = element.nextElementSibling;
if (!origin) { if (!origin) {
@ -157,7 +157,16 @@ export class DocViewerComponent implements DoCheck, OnDestroy {
} }
} }
swapOriginAndResult(root: Element): void { }
function findTranslationResult(element: Element): Element {
while (element && !element.hasAttribute('translation-result')) {
element = element.parentElement;
}
return element;
}
function swapOriginAndResult(root: Element): void {
const results = root.querySelectorAll('[translation-result]'); const results = root.querySelectorAll('[translation-result]');
for (let i = 0; i < results.length; ++i) { for (let i = 0; i < results.length; ++i) {
const result = results.item(i); const result = results.item(i);
@ -167,4 +176,3 @@ export class DocViewerComponent implements DoCheck, OnDestroy {
} }
} }
} }
}