[Libreoffice-commits] online.git: loleaflet/src

[Florin Ciornei (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit fa6e1054a9fe21ced91dda2d13caf9a49d8c9ffd
Author:     Florin Ciornei <florin.ciornei at collabora.com>
AuthorDate: Thu May 23 13:46:22 2019 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Thu Jul 11 21:57:54 2019 +0200

    Set focus on document after closing copy/paste/cut warning.
    
    Change-Id: I4e241278bea441f77e6b7780d69e540f9e6d4771
    Reviewed-on: https://gerrit.libreoffice.org/72838
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 79468654f54358c77ee8240053cccdd69fc055b3)
    Reviewed-on: https://gerrit.libreoffice.org/75435
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 3530778b1..b1bca8f4a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -805,7 +805,13 @@ L.Control.Menubar = L.Control.extend({
 		} else if (id === 'repair') {
 			this._map._socket.sendMessage('commandvalues command=.uno:DocumentRepair');
 		} else if (!window.ThisIsAMobileApp && id === 'warn-copy-paste') {
-			vex.dialog.alert({unsafeMessage: _('<p>Your browser has very limited access to the clipboard, so use these keyboard shortcuts:<ul><li><b>Ctrl+C</b>: For copying.</li><li><b>Ctrl+X</b>: For cutting.</li><li><b>Ctrl+V</b>: For pasting.</li></ul></p>')});
+			var self = this;
+			vex.dialog.alert({
+				unsafeMessage: _('<p>Your browser has very limited access to the clipboard, so use these keyboard shortcuts:<ul><li><b>Ctrl+C</b>: For copying.</li><li><b>Ctrl+X</b>: For cutting.</li><li><b>Ctrl+V</b>: For pasting.</li></ul></p>'),
+				callback: function () {
+					self._map.focus();
+				}
+			});
 		} else if (window.ThisIsAMobileApp && $(item).data('mobileappuno')) {
 			this._map.sendUnoCommand($(item).data('mobileappuno'));
 		}