loleaflet/src/control/Control.JSDialogBuilder.js |    2 +-
 loleaflet/src/map/Clipboard.js                   |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit fc04ba5502d331bde58d796000a787f98b6c87aa
Author:     mert <[email protected]>
AuthorDate: Wed Dec 18 19:51:48 2019 +0300
Commit:     Michael Meeks <[email protected]>
CommitDate: Wed Dec 18 19:29:18 2019 +0100

    Clipboard improvements for online mobile
    
    This patch allows me to copy content to clipboard
    and paste it into another apps also it works
    with images/shapes too. They are able to be copied into
    clipboard.
    
    Change-Id: If6660e1f0ee5821fccbb257d2baab45305b4c3fb
    Reviewed-on: https://gerrit.libreoffice.org/85408
    Tested-by: Jenkins CollaboraOffice <[email protected]>
    Reviewed-by: Michael Meeks <[email protected]>
    Tested-by: Michael Meeks <[email protected]>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index f031a13d8..617a8d9d0 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1444,7 +1444,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
                                // before close the wizard then execute the 
action
                                if (data.executionType === 'action') {
                                        
builder.map.menubar._executeAction(undefined, data.id);
-                               } else {
+                               } else if 
(!builder.map._clip.filterExecCopyPaste(data.command)) {
                                        builder.map.sendUnoCommand(data.command)
                                }
                        });
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 2808f2690..65ab6d1ab 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -469,7 +469,8 @@ L.Clipboard = L.Class.extend({
 
                var plainText = this.stripHTML(text);
                if (ev.clipboardData) { // Standard
-                       ev.clipboardData.setData('text/plain', plainText);
+                       // if copied content is graphical then plainText is 
null and it does not work on mobile.
+                       ev.clipboardData.setData('text/plain', plainText ? 
plainText: ' ');
                        ev.clipboardData.setData('text/html', text);
                        console.log('Put "' + text + '" on the clipboard');
                        this._clipboardSerial++;
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to