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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 978d1b391b1c731f411c0236714326ccd56bc887
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Thu Jul 23 01:37:13 2020 +0530
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Jul 24 12:40:27 2020 +0200

    leaflet: show the checks for view in hamburger menu
    
    automatic spell checking, formatting marks, resolved comments
    these options will have checks according to their states
    
    Change-Id: I92ebf0b99720eedc8826080f7bb956fa4d8256b9
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99258
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/loleaflet/images/lc_showresolved.svg b/loleaflet/images/lc_showresolvedannotations.svg
similarity index 100%
rename from loleaflet/images/lc_showresolved.svg
rename to loleaflet/images/lc_showresolvedannotations.svg
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index ff1c36395..ca4274902 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -524,7 +524,7 @@ L.Control.Menubar = L.Control.extend({
 			{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [
 				{uno: '.uno:ControlCodes'},
 				{uno: '.uno:SpellOnline'},
-				{name: _UNO('.uno:ShowResolvedAnnotations', 'text'), id: 'showresolved', type: 'action'},
+				{name: _UNO('.uno:ShowResolvedAnnotations', 'text'), id: 'showresolved', type: 'action', uno: '.uno:ShowResolvedAnnotations'},
 			]
 			},
 			{name: _('Latest Updates'), id: 'latest-updates', type: 'action', iosapp: false},
@@ -1594,7 +1594,11 @@ L.Control.Menubar = L.Control.extend({
 			if (state && state[style]) {
 				menuStructure['checked'] = true;
 			}
-		} else if (item.uno === '.uno:TrackChanges' || item.uno === '.uno:ShowTrackedChanges') {
+		} else if (item.uno === '.uno:TrackChanges' ||
+			item.uno === '.uno:ShowTrackedChanges' ||
+			item.uno === '.uno:ControlCodes' ||
+			item.uno === '.uno:SpellOnline' ||
+			item.uno === '.uno:ShowResolvedAnnotations') {
 			if (this._map['stateChangeHandler'].getItemValue(item.uno) === 'true') {
 				menuStructure['checked'] = true;
 			}