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

fix: don't swap when loading

Browse Source
This commit is contained in:
Zhicheng WANG 2019-01-01 21:53:07 +08:00
parent 1d65a38dcf
commit d33259520b
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ const initialDocViewerContent = initialDocViewerElement ? initialDocViewerElemen
@Component({ @Component({
selector: 'aio-doc-viewer', selector: 'aio-doc-viewer',
template: '' template: '',
// TODO(robwormald): shadow DOM and emulated don't work here (?!) // TODO(robwormald): shadow DOM and emulated don't work here (?!)
// encapsulation: ViewEncapsulation.Native // encapsulation: ViewEncapsulation.Native
}) })
@ -70,7 +70,6 @@ export class DocViewerComponent implements 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;
swapOriginAndResult(this.hostElement);
if (this.hostElement.firstElementChild) { if (this.hostElement.firstElementChild) {
this.currViewContainer = this.hostElement.firstElementChild as HTMLElement; this.currViewContainer = this.hostElement.firstElementChild as HTMLElement;
@ -134,7 +133,6 @@ export class DocViewerComponent implements OnDestroy {
// Security: `doc.contents` is always authored by the documentation team // Security: `doc.contents` is always authored by the documentation team
// and is considered to be safe. // and is considered to be safe.
tap(() => this.nextViewContainer.innerHTML = doc.contents || ''), tap(() => this.nextViewContainer.innerHTML = doc.contents || ''),
tap(() => swapOriginAndResult(this.nextViewContainer)),
tap(() => addTitleAndToc = this.prepareTitleAndToc(this.nextViewContainer, doc.id)), tap(() => addTitleAndToc = this.prepareTitleAndToc(this.nextViewContainer, doc.id)),
switchMap(() => this.elementsLoader.loadContainedCustomElements(this.nextViewContainer)), switchMap(() => this.elementsLoader.loadContainedCustomElements(this.nextViewContainer)),
tap(() => this.docReady.emit()) tap(() => this.docReady.emit())
@ -262,14 +260,3 @@ function findTranslationResult(element: Element | null): Element | null {
} }
return element; return element;
} }
function swapOriginAndResult(root: Element): void {
const results = root.querySelectorAll('[translation-result]');
for (let i = 0; i < results.length; ++i) {
const result = results.item(i);
const origin = result.previousElementSibling;
if (origin && origin.hasAttribute('translation-origin') && origin.parentElement) {
origin.parentElement.insertBefore(result, origin);
}
}
}