Skip to content

Commit

Permalink
a 2nd click during dblclick should have .detail=2
Browse files Browse the repository at this point in the history
  • Loading branch information
gdh1995 committed Sep 9, 2023
1 parent 9a2e916 commit 66a5189
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion content/async_dispatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ export const click_async = (async (element: SafeElementForMouse
|| (OnFirefox && Build.MinFFVer < FirefoxBrowserVer.MinPopupBlockerPassOrdinaryClicksDuringExtMessages
&& /*#__INLINE__*/ prepareToBlockClick_old_ff(result === ActionType.DispatchAndMayOpenTab
, action < kClickAction.plainMayOpenManually + 1 && parentAnchor!),
(await await mouse_(element, CLK, center, modifiers, 0, 0, isTouch)) && result
(await await mouse_(element, CLK, center, modifiers, 0, button, isTouch)) && result
|| result & ActionType.dblClick))
&& getVisibleClientRect_(element)) {
// require element is still visible
Expand Down
2 changes: 1 addition & 1 deletion pages/options.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</tr></thead>
<tbody></tbody>
</table>
<template id="exclusionTemplate"><table><tr class="exclusionRule">
<template id="exclusionTemplate"><table><tr class="exclusionRule" draggable="true">
<td>
<input type="text" class="pattern" placeholder=":https://example.net/" autocomplete="off" />
</td>
Expand Down
6 changes: 3 additions & 3 deletions pages/options_base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export class ExclusionRulesOption_ extends Option_<"exclusionRules"> {
this.list_ = [];
delayBinding_(this.$list_, "input", ExclusionRulesOption_.MarkChanged_)
delayBinding_(this.$list_, "input", this.onUpdated_)
delayBinding_(this.$list_, "click", e => this.onRemoveRow_(e))
delayBinding_(this.$list_, "click", e => { this.onRemoveRow_(e) })
this._rendered = false
delayBinding_("#exclusionAddButton", "click", () => this.addRule_(""), "on")
}
Expand Down Expand Up @@ -389,7 +389,6 @@ addRule_ (pattern: string, autoFocus?: false | undefined): void {
override populateElement_ (rules: ExclusionsNS.StoredRule[]): void {
if (!this._rendered) {
this._rendered = true
if (Option_.syncToFrontend_) { this.template_.draggable = true }
for (const el of pageLangs_ !== "en" ? $$("[title]", this.template_) : []) {
const t = pageTrans_(el.title)
t && (el.title = t)
Expand Down Expand Up @@ -449,7 +448,7 @@ static OnNewKeys_ (vnode: ExclusionVisibleVirtualNode): void {
vnode.$keys_.placeholder = "";
}
}
onRemoveRow_ (event: Event): void {
onRemoveRow_ (event: EventToPrevent): void {
let element = event.target as EnsuredMountedElement
element.localName === "path" && (element = element.parentElement)
element.localName === "svg" && (element = element.parentElement)
Expand All @@ -458,6 +457,7 @@ onRemoveRow_ (event: Event): void {
if (element.classList.contains("exclusionRule")) {
const vnode = (element.querySelector(".pattern") as ExclusionRealNode).vnode;
element.remove();
event.preventDefault()
if (vnode.changed_ & kExclusionChange.mismatches && vnode.savedRule_.pattern) {
Object.assign<ExclusionBaseVirtualNode, Partial<ExclusionBaseVirtualNode>>(vnode, {
rule_: { passKeys: "", pattern: ""}, matcher_: false,
Expand Down
6 changes: 6 additions & 0 deletions pages/options_popup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ let _onlyFirstMatch: boolean
const pTrans_: TransTy<keyof typeof i18n_popup> = (k, a): string => pageTrans_(k, a) || ""

class PopExclusionRulesOption extends ExclusionRulesOption_ {
override init_ (element: HTMLElement): void {
super.init_(element)
this.$list_.onmousedown = (event: MouseEventToPrevent): void => {
event.detail > 1 && (event.target as EnsuredMountedElement).localName !== "input" && event.preventDefault()
}
}
override addRule_ (_pattern: string, autoFocus?: false): void {
super.addRule_(PopExclusionRulesOption.generateDefaultPattern_(), autoFocus)
}
Expand Down

0 comments on commit 66a5189

Please sign in to comment.