Skip to content

Commit

Permalink
🔀 Merge branch 'main' of github.com:codermarcos/simple-mask-money int…
Browse files Browse the repository at this point in the history
…o fix/#67/problem-input-behaviour

Conflicts:
	src/set-mask.ts

On branch fix/#67/problem-input-behaviour
All conflicts fixed but you are still merging.

Changes to be committed:
	modified:   package-lock.json
	modified:   package.json
	modified:   src/set-mask.ts
  • Loading branch information
codermarcos committed Jan 28, 2024
2 parents 2252bcc + 030573f commit 26727ac
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple-mask-money",
"version": "4.1.0",
"version": "4.1.1",
"private": false,
"description": "Simple money mask developed with pure JavaScript. To run on Client Side and Server Side",
"types": "./lib/simple-mask-money.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion src/set-mask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ function setMask(
} else {
triggerInputChanges(initialValue);
}

if (element.hasAttribute('readonly') || element.hasAttribute('disabled')) return () => void 0;

element.addEventListener('keydown', onKeyDown);
Expand Down

0 comments on commit 26727ac

Please sign in to comment.