javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(types): add null checks (#16351)

Browse Source
This commit is contained in:
Adam Bradley
2018-11-16 22:20:51 -06:00
committed by GitHub
parent 2e8f15af18
commit 8cb266ba34
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/components/router/router.tsx
View File

@ -160,12 +160,14 @@ export class Router implements ComponentInterface {
} }
private historyDirection() { private historyDirection() {
if (this.win.history.state === null) { const win = this.win;
if (win.history.state === null) {
this.state++; this.state++;
this.win.history.replaceState(this.state, this.win.document.title, this.win.document.location.href); win.history.replaceState(this.state, win.document.title, win.document.location && win.document.location.href);
} }
const state = this.win.history.state; const state = win.history.state;
const lastState = this.lastState; const lastState = this.lastState;
this.lastState = state; this.lastState = state;

4
core/src/components/split-pane/split-pane.tsx
View File

@ -112,8 +112,8 @@ export class SplitPane implements ComponentInterface {
this.visible = q.matches; this.visible = q.matches;
}; };
const mediaList = this.win.matchMedia(mediaQuery); const mediaList = this.win.matchMedia(mediaQuery);
mediaList.addListener(callback); mediaList.addListener(callback as any);
this.rmL = () => mediaList.removeListener(callback); this.rmL = () => mediaList.removeListener(callback as any);
this.visible = mediaList.matches; this.visible = mediaList.matches;
} }

2
core/src/components/virtual-scroll/virtual-scroll-utils.ts
View File

@ -124,7 +124,7 @@ export function doRender(
function createNode(el: HTMLElement, type: CellType): HTMLElement | null { function createNode(el: HTMLElement, type: CellType): HTMLElement | null {
const template = getTemplate(el, type); const template = getTemplate(el, type);
if (template) { if (template && el.ownerDocument) {
return el.ownerDocument.importNode(template.content, true).children[0] as HTMLElement; return el.ownerDocument.importNode(template.content, true).children[0] as HTMLElement;
} }
return null; return null;

2
core/src/utils/framework-delegate.ts
View File

@ -15,7 +15,7 @@ export async function attachComponent(
} }
const el: any = (typeof component === 'string') const el: any = (typeof component === 'string')
? container.ownerDocument.createElement(component) ? container.ownerDocument && container.ownerDocument.createElement(component)
: component; : component;
if (cssClasses) { if (cssClasses) {

2
core/src/utils/keyboard.ts
View File

@ -1,7 +1,7 @@
export function isTextInputFocused(doc: Document): boolean { export function isTextInputFocused(doc: Document): boolean {
const activeElement = doc.activeElement; const activeElement = doc.activeElement;
if (isTextInput(activeElement) && activeElement.parentElement) { if (activeElement && isTextInput(activeElement) && activeElement.parentElement) {
return activeElement.parentElement.querySelector(':focus') === activeElement; return activeElement.parentElement.querySelector(':focus') === activeElement;
} }
return false; return false;