loleaflet/src/map/Clipboard.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit fa4bad21effb4c1e3acd5b7383f2420fa3c31271
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 7 10:38:43 2019 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Sep 25 14:47:33 2019 +0200
IE11: make sure to call beforecopy handler in _onConfirmCopyAction
Change-Id: Ibb3db7d69e50069c0669184e594e1df245604023
Reviewed-on: https://gerrit.libreoffice.org/79546
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 2637c78cb..05af7afe9 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -480,8 +480,11 @@ L.Clipboard = L.Class.extend({
// Does the selection of text before an event comes in
_beforeSelect: function(ev) {
console.log('Got event ' + ev.type + ' setting up selection');
+ this._beforeSelectImpl(ev.type);
+ },
- if (window.isInternetExplorer && ev.type != 'paste')
+ _beforeSelectImpl: function(operation) {
+ if (window.isInternetExplorer && operation != 'paste')
// We need populate our content into the div for
// the brower to copy.
this._dummyDiv.innerHTML = this._getHtmlForClipboard();
@@ -495,7 +498,7 @@ L.Clipboard = L.Class.extend({
var selected = false;
var selectRange;
- if (window.isInternetExplorer && ev.type != 'paste')
+ if (window.isInternetExplorer && operation != 'paste')
{
this._dummyDiv.focus();
@@ -559,6 +562,8 @@ L.Clipboard = L.Class.extend({
var serial = this._clipboardSerial;
// try a direct execCommand.
+ if (window.isInternetExplorer && operation != 'paste')
+ this._beforeSelectImpl(operation);
if (document.execCommand(operation) &&
serial !== this._clipboardSerial) {
console.log('copied successfully');
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
