Skip to content

Commit

Permalink
fix: Accidentally using type-guards for HTMLLinkElement instead of HT…
Browse files Browse the repository at this point in the history
…MLAnchorElement.
  • Loading branch information
Sub-Xaero committed Mar 8, 2021
1 parent 5aae0c3 commit d3f2be9
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 60 deletions.
2 changes: 1 addition & 1 deletion dist/stimulus-library.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stimulus-library.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stimulus-library.modern.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stimulus-library.modern.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stimulus-library.module.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stimulus-library.module.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stimulus-library.umd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/stimulus-library.umd.js.map

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions dist/utilities/elements.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
export declare function isHTMLLinkElement(element: Element): element is HTMLLinkElement;
export declare function isHTMLFormElement(element: Element): element is HTMLFormElement;
export declare function isHTMLInputElement(element: Element): element is HTMLInputElement;
export declare function isHTMLSelectElement(element: Element): element is HTMLSelectElement;
export declare function isHTMLImageElement(element: Element): element is HTMLImageElement;
export declare function isElementCheckable(element: Element): element is HTMLInputElement & {
checked: boolean;
};
export declare function isHTMLLinkElement(element: Element): element is HTMLLinkElement;
export declare function isHTMLAnchorElement(element: Element): element is HTMLAnchorElement;
export declare function isHTMLFormElement(element: Element): element is HTMLFormElement;
export declare function isHTMLInputElement(element: Element): element is HTMLInputElement;
export declare function isHTMLSelectElement(element: Element): element is HTMLSelectElement;
export declare function isHTMLImageElement(element: Element): element is HTMLImageElement;
export declare function isElementCheckable(element: Element): element is HTMLInputElement & {
checked: boolean;
};
//# sourceMappingURL=elements.d.ts.map
2 changes: 1 addition & 1 deletion dist/utilities/elements.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 41 additions & 41 deletions src/confirm_controller.ts
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
import {BaseController} from './base_controller';
import {isHTMLFormElement, isHTMLLinkElement} from "./utilities/elements";

export class ConfirmController extends BaseController {

static values = {
message: String,
};

declare readonly messageValue: string;
declare readonly hasMessageValue: boolean;

get message(): string {
return this.hasMessageValue ? this.messageValue : 'Are you sure?';
}

initialize() {
this.confirm = this.confirm.bind(this);
}

connect() {
requestAnimationFrame(() => {
let element = this.el;
if (isHTMLFormElement(element)) {
element.addEventListener("submit", this.confirm);
} else if (isHTMLLinkElement(element)) {
element.addEventListener("click", this.confirm);
} else {
throw new Error("Can't handle confirmation on attached element");
}
});
}

confirm(event: Event) {
if (!(window.confirm(this.message))) {
event.preventDefault();
this.dispatch(this.el, "confirm:cancelled");
}
}

}
import {BaseController} from './base_controller';
import {isHTMLFormElement, isHTMLAnchorElement} from "./utilities/elements";

export class ConfirmController extends BaseController {

static values = {
message: String,
};

declare readonly messageValue: string;
declare readonly hasMessageValue: boolean;

get message(): string {
return this.hasMessageValue ? this.messageValue : 'Are you sure?';
}

initialize() {
this.confirm = this.confirm.bind(this);
}

connect() {
requestAnimationFrame(() => {
let element = this.el;
if (isHTMLFormElement(element)) {
element.addEventListener("submit", this.confirm);
} else if (isHTMLAnchorElement(element)) {
element.addEventListener("click", this.confirm);
} else {
throw new Error("Can't handle confirmation on attached element");
}
});
}

confirm(event: Event) {
if (!(window.confirm(this.message))) {
event.preventDefault();
this.dispatch(this.el, "confirm:cancelled");
}
}

}
4 changes: 2 additions & 2 deletions src/turbo_frame_rc_controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {BaseController} from "./base_controller";
import {isHTMLLinkElement} from "./utilities/elements";
import {isHTMLAnchorElement} from "./utilities/elements";
import {isTurboFrame} from "./utilities/turbo";

export class TurboFrameRCController extends BaseController {
Expand Down Expand Up @@ -67,7 +67,7 @@ export class TurboFrameRCController extends BaseController {
let element = this.el;
if (this.hasSrcValue) {
return this.srcValue;
} else if (isHTMLLinkElement(element)) {
} else if (isHTMLAnchorElement(element)) {
return element.href;
} else {
throw new Error("No link given to drive frame to");
Expand Down
4 changes: 4 additions & 0 deletions src/utilities/elements.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
export function isHTMLLinkElement(element: Element): element is HTMLLinkElement {
return element.nodeName == "LINK";
}

export function isHTMLAnchorElement(element: Element): element is HTMLAnchorElement {
return element.nodeName == "A";
}

Expand Down

0 comments on commit d3f2be9

Please sign in to comment.