loleaflet/src/control/Control.MobileInput.js | 13 +++++++++++-- wsd/FileServer.cpp | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit ea5165794338a05837cc14257ebfcf0fa437c2ab Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Oct 3 23:49:45 2018 +0200 Commit: Aron Budea <[email protected]> CommitDate: Thu Oct 4 01:06:02 2018 +0200 android chrome: Move the onTextInput handling to a separate method. Change-Id: I1cf091ed9bf82b719ff7bd5170b9e75ecb999d01 Reviewed-on: https://gerrit.libreoffice.org/61336 Reviewed-by: Aron Budea <[email protected]> Tested-by: Aron Budea <[email protected]> diff --git a/loleaflet/src/control/Control.MobileInput.js b/loleaflet/src/control/Control.MobileInput.js index 94084371b..45920f63a 100644 --- a/loleaflet/src/control/Control.MobileInput.js +++ b/loleaflet/src/control/Control.MobileInput.js @@ -75,7 +75,8 @@ L.Control.MobileInput = L.Control.extend({ this._textArea.setAttribute('spellcheck', 'false'); L.DomEvent.on(this._textArea, stopEvents, L.DomEvent.stopPropagation) .on(this._textArea, 'keydown keypress keyup', this.onKeyEvents, this) - .on(this._textArea, 'compositionstart compositionupdate compositionend textInput', this.onCompEvents, this) + .on(this._textArea, 'compositionstart compositionupdate compositionend', this.onCompEvents, this) + .on(this._textArea, 'textInput', this.onTextInput, this) .on(this._textArea, 'input', this.onInput, this) .on(this._textArea, 'focus', this.onGotFocus, this) .on(this._textArea, 'blur', this.onLostFocus, this); @@ -152,7 +153,14 @@ L.Control.MobileInput = L.Control.extend({ map._docLayer._postCompositionEvent(0, 'end', ''); } - if (e.type === 'textInput' && !this._keyHandled) { + L.DomEvent.stopPropagation(e); + }, + + onTextInput: function (e) { + console.log('onTextInput: e.type === ' + e.type); + console.log('onTextInput: e.data === "' + e.data + '"'); + + if (!this._keyHandled) { // Hack for making space in combination with autocompletion text // input work in Chrome on Andorid. // @@ -166,6 +174,7 @@ L.Control.MobileInput = L.Control.extend({ } this._textArea.value = ''; } + L.DomEvent.stopPropagation(e); }, commit fde08ea55af98b0374fe872870ebfcedc098c515 Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Oct 3 23:42:30 2018 +0200 Commit: Aron Budea <[email protected]> CommitDate: Thu Oct 4 01:05:54 2018 +0200 debugging: Set noCache when LOOL_SERVE_FROM_FS is set. Makes debugging on Android browser so much easier, as it is otherwise hard to force reload. Change-Id: Iede4fec1c2a110f0ae4b73095ed19f0ee29fa736 Reviewed-on: https://gerrit.libreoffice.org/61335 Reviewed-by: Aron Budea <[email protected]> Tested-by: Aron Budea <[email protected]> diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp index 5b3aed55b..35b43c27e 100644 --- a/wsd/FileServer.cpp +++ b/wsd/FileServer.cpp @@ -266,6 +266,10 @@ void FileServerRequestHandler::handleRequest(const HTTPRequest& request, Poco::M try { bool noCache = false; +#if ENABLE_DEBUG + if (std::getenv("LOOL_SERVE_FROM_FS")) + noCache = true; +#endif Poco::Net::HTTPResponse response; Poco::URI requestUri(request.getURI()); LOG_TRC("Fileserver request: " << requestUri.toString()); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
