Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

fix: table of contents not working within cdk #545

Merged
merged 1 commit into from
Oct 19, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/app/material-docs-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ export class MaterialDocsApp {
}
}

function isNavigationWithinComponentView(oldUrl: string, newUrl: string) {
const componentViewExpression = /components\/(\w+)/;
return oldUrl && newUrl
&& componentViewExpression.test(oldUrl)
&& componentViewExpression.test(newUrl)
&& oldUrl.match(componentViewExpression)[1] === newUrl.match(componentViewExpression)[1];
function isNavigationWithinComponentView(previousUrl: string, newUrl: string) {
const componentViewExpression = /(cdk|components)\/(\w+)/;

const previousUrlMatch = previousUrl.match(componentViewExpression);
const newUrlMatch = newUrl.match(componentViewExpression);

return previousUrl && newUrl && previousUrlMatch && newUrlMatch
&& previousUrlMatch[0] === newUrlMatch[0]
&& previousUrlMatch[1] === newUrlMatch[1];
}

function resetScrollPosition() {
Expand Down