diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-12-19 11:20:26 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-12-19 13:25:50 +0100 |
| commit | 98e2a9f98ba88b5ed0192c693730139c58b51900 (patch) | |
| tree | a8f5788f6146db043ae8dcf3e5b10a408aa2903b | |
| parent | e981bf26b32a260df25553c8232f6b73f92e4fa5 (diff) | |
sidebars: if we don't have a sidebar id - use -1 instead.
A matching patch looks up the view's sidebar-window for large
dialog identifiers in core.
Change-Id: Ib7ee3f09af739dbe857a795725316040046a171f
Reviewed-on: https://gerrit.libreoffice.org/85513
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | loleaflet/src/control/Control.JSDialogBuilder.js | 3 | ||||
| -rw-r--r-- | loleaflet/src/control/Control.MobileWizard.js | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index 9d91807cd..916157c99 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -104,7 +104,8 @@ L.Control.JSDialogBuilder = L.Control.extend({ builder.map.sendUnoCommand(data); } else if (object) { data = typeof data === 'string' ? data.replace('"', '\\"') : data; - var message = 'dialogevent ' + window.sidebarId + ' {\"id\":\"' + object.id + '\", \"cmd\": \"' + eventType + '\", \"data\":\"' + data + '\"}'; + var message = 'dialogevent ' + (window.sidebarId !== undefined ? window.sidebarId : -1) + + ' {\"id\":\"' + object.id + '\", \"cmd\": \"' + eventType + '\", \"data\":\"' + data + '\"}'; builder.map._socket.sendMessage(message); } }, diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js index 035d14f36..712677c4a 100644 --- a/loleaflet/src/control/Control.MobileWizard.js +++ b/loleaflet/src/control/Control.MobileWizard.js @@ -226,7 +226,9 @@ L.Control.MobileWizard = L.Control.extend({ _refreshSidebar: function() { var map = this.map; setTimeout(function () { - var message = 'dialogevent ' + window.sidebarId + ' {\"id\":\"-1\"}'; + var message = 'dialogevent ' + + (window.sidebarId !== undefined ? window.sidebarId : -1) + + ' {\"id\":\"-1\"}'; map._socket.sendMessage(message); }, 400); }, |