Skip to content

Commit 9ea3154

Browse files
authored
Merge pull request #499 from bastih/fix-focus
.caret can steal focus thus run before .blur
2 parents 4842a61 + 353993a commit 9ea3154

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

js/jquery.keyboard.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,13 +1536,15 @@ http://www.opensource.org/licenses/mit-license.php
15361536
// don't trigger beforeClose if keyboard is always open
15371537
base.$el.trigger(kbevents.kbBeforeClose, [base, base.el, (accepted || false)]);
15381538
}
1539+
// save caret after updating value (fixes userClosed issue with changing focus)
1540+
$keyboard.caret(base.$preview, base.last);
1541+
15391542
base.$el
15401543
.trigger(((accepted || false) ? kbevents.inputAccepted : kbevents.inputCanceled), [base, base.el])
15411544
.trigger((o.alwaysOpen) ? kbevents.kbInactive : kbevents.kbHidden, [base, base.el])
15421545
.blur();
15431546

1544-
// save caret after updating value (fixes userClosed issue with changing focus)
1545-
$keyboard.caret(base.$preview, base.last);
1547+
15461548
// base is undefined if keyboard was destroyed - fixes #358
15471549
if (base) {
15481550
// add close event time

0 commit comments

Comments
 (0)