Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Chromebook text input focus issues #518

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions loleaflet/src/layer/marker/TextInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,12 +275,12 @@ L.TextInput = L.Layer.extend({

// Trick to avoid showing the software keyboard: Set the textarea
// read-only before focus() and reset it again after the blur()
if (navigator.platform !== 'iPhone') {
if (navigator.platform !== 'iPhone' && !window.mode.isChromebook()) {
if ((window.ThisIsAMobileApp || window.mode.isMobile()) && acceptInput !== true)
this._textArea.setAttribute('readonly', true);
}

if (navigator.platform !== 'iPhone') {
if (navigator.platform !== 'iPhone' && !window.mode.isChromebook()) {
this._textArea.focus();
} else if (acceptInput === true) {
// On the iPhone, only call the textarea's focus() when we get an explicit
Expand All @@ -302,7 +302,7 @@ L.TextInput = L.Layer.extend({
this._textArea.focus();
}

if (navigator.platform !== 'iPhone') {
if (navigator.platform !== 'iPhone' && !window.mode.isChromebook()) {
if ((window.ThisIsAMobileApp || window.mode.isMobile()) && acceptInput !== true) {
this._setAcceptInput(false);
this._textArea.blur();
Expand All @@ -329,7 +329,7 @@ L.TextInput = L.Layer.extend({
}

this._setAcceptInput(false);
if (navigator.platform !== 'iPhone')
if (navigator.platform !== 'iPhone' && !window.mode.isChromebook())
this._textArea.blur();
},

Expand Down