loleaflet/js/toolbar.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 58cf58d6d640af79230c5c84207a4fa607bd451d
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Wed May 22 10:14:01 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed May 22 10:28:27 2019 +0200
mobile: Avoid uncaught exceptions when some toolbars don't exist at all.
Change-Id: Ie29c2cdf83bce5d65bf64cd982917186f7adbc8e
Reviewed-on: https://gerrit.libreoffice.org/72729
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index e0916cdd3..69f63e3f0 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -91,23 +91,23 @@ function onClick(e, id, item, subItem) {
var toolbar = w2ui['editbar'];
item = toolbar.get(id);
}
- else if (w2ui.formulabar.get(id) !== null) {
- toolbar = w2ui.formulabar;
+ else if ('formulabar' in w2ui && w2ui['formulabar'].get(id) !== null) {
+ toolbar = w2ui['formulabar'];
item = toolbar.get(id);
}
else if ('document-signing-bar' in w2ui &&
w2ui['document-signing-bar'].get(id) !== null) {
toolbar = w2ui['document-signing-bar'];
item = toolbar.get(id);
}
- else if (w2ui['actionbar'].get(id) !== null) {
+ else if ('actionbar' in w2ui && w2ui['actionbar'].get(id) !== null) {
toolbar = w2ui['actionbar'];
item = toolbar.get(id);
}
- else if (w2ui['spreadsheet-toolbar'].get(id) !== null) {
+ else if ('spreadsheet-toolbar' in w2ui &&
w2ui['spreadsheet-toolbar'].get(id) !== null) {
toolbar = w2ui['spreadsheet-toolbar'];
item = toolbar.get(id);
}
- else if (w2ui['presentation-toolbar'].get(id) !== null) {
+ else if ('presentation-toolbar' in w2ui &&
w2ui['presentation-toolbar'].get(id) !== null) {
toolbar = w2ui['presentation-toolbar'];
item = toolbar.get(id);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
