jsdialog based calc tab-bar, removed jquery-contextmenu by dennisfrancis · Pull Request #15423 · CollaboraOnline/online

dennisfrancis · 2026-04-08T09:51:09Z

Target version: main

Summary

jsdialog based calc tab-bar context menu.
Change in calc cypress test helper.
Remove unused Control.ContextMenu.js

This is related to #13948

Checklist

I have run make prettier-write and formatted the code.
All commits have Change-Id
I have run tests with make check
I have issued make run and manually verified that everything looks okay
Documentation (manuals or wiki) has been updated or is not required

Darshan-upadhyay1110 · 2026-04-15T13:23:19Z

Hi @dennisfrancis! Is this PR ready for review? If so, could you add the appropriate reviewer(s)? Thanks! 🙂

dennisfrancis · 2026-04-15T14:11:51Z

Hi @dennisfrancis! Is this PR ready for review? If so, could you add the appropriate reviewer(s)? Thanks! 🙂

This still needs some work. I've marked this as draft. Thanks.

dennisfrancis · 2026-04-15T17:59:33Z

Screenshots:

Before

After

eszkadev · 2026-04-16T13:58:13Z

please rebase to pass tests

dennisfrancis · 2026-04-16T17:20:07Z

CI fails in impress mobile:

Test failed: integration_tests/mobile/impress/slide_properties_spec.js / Changing slide properties. / Change master objects visibility.
                    
                    Timed out retrying after 10000ms: expected true to be false
                    
                    /home/collabora/jenkins/workspace/github_online_master_debug_vs_co-26.04_cypress_mobile/cypress_test/integration_tests/common/helper.js:647:34
                      645 |             expect(result).to.be.true;
                      646 |         else
                    > 647 |             expect(result).to.be.false;
                          |                                  ^
                      648 |     });
                      649 |     cy.log('<< isImageWhite - end');
                      650 | }

But I can't reproduce this with latest online main branch.

eszkadev

Worked well for me, I removed also the library itself.
Adding second reviewer

This is related to #13948 Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: Ie8b1b0e12946d3a1d87f0104ed174623f068ea89

Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: Id63728812ce4142a4549fbdedfcf9bde85859c79

Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: I668c711dbac98cead4fe2ed3715906b484387f76

Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: I85462dd7acf2c129dcc402b69dbc068a26772316

Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: I0dca0b9272935946df30f9684cc5b48feb02b03f

- we no longer use jQuery menu so no need to close it - do not need main level CSS for context menu Signed-off-by: Szymon Kłos <szymon.klos@collabora.com> Change-Id: If7fdc0af34af7d9eb72f7089437ee02f568a34d3

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com> Change-Id: I43cea6c46a1bd30324c3dc77fa5a8434e01095a1

dennisfrancis · 2026-04-19T12:53:26Z

@eszkadev The removal of css in css/jsdialogs.css and/or css/device-mobile.css has caused cypress mobile failure in sheet operations. When running make run-mobile spec=calc/sheet_operation_spec.js it shows oversized menu entries. Excluding the those removals fixes the cypress issue.

eszkadev · 2026-04-20T04:55:37Z

Interesting, I did grep and didn't found these classes. Must be concatenated somewhere. Thanks for fixing

eszkadev · 2026-04-20T04:59:35Z

+
+			const isUNO = key.startsWith('.uno:');
+			if (Object.prototype.hasOwnProperty.call(data, '_uno')) key = data._uno;
+			let text = isUNO ? _UNO(key, 'spreadsheet', true): _(data._text);


_( ) requires string inside, you cannot do it this way,
Please do it in the JSON

eszkadev · 2026-04-20T04:59:59Z

 				isHtmlName: true,
-				callback: (this._insertSheetBefore).bind(this)
+				callback: (this._insertSheetBefore).bind(this),
+				_text: 'Insert sheet before this',


we need _( ) here to get it working

eszkadev · 2026-04-20T05:00:11Z

 				isHtmlName: true,
-				callback: (this._insertSheetAfter).bind(this)
+				callback: (this._insertSheetAfter).bind(this),
+				_text: 'Insert sheet after this',


eszkadev · 2026-04-20T05:00:25Z

 				callback: (this._moveSheetLeft).bind(this),
-				visible: areTabsMultiple
+				visible: areTabsMultiple,
+				_text: 'Move Sheet Left',


eszkadev · 2026-04-20T05:00:33Z

 				callback: (this._moveSheetRight).bind(this),
-				visible: areTabsMultiple
+				visible: areTabsMultiple,
+				_text: 'Move Sheet Right',


eszkadev · 2026-04-20T05:00:40Z

 					return !areTabsMultiple();
-				}
+				},
+				_text: 'Copy Sheet...',


translations need a fix

timar

The SBOM changes look OK.

github-project-automation bot added this to Collabora Online Apr 8, 2026

github-project-automation bot moved this to To Review in Collabora Online Apr 8, 2026

dennisfrancis force-pushed the private/dennisf/jsdialog-ctxtmenu branch from 0493856 to 5f21ff9 Compare April 15, 2026 11:34

dennisfrancis marked this pull request as draft April 15, 2026 14:10

dennisfrancis force-pushed the private/dennisf/jsdialog-ctxtmenu branch from 5f21ff9 to 3717806 Compare April 15, 2026 17:53

dennisfrancis marked this pull request as ready for review April 15, 2026 17:53

dennisfrancis force-pushed the private/dennisf/jsdialog-ctxtmenu branch from 3717806 to 807bb3c Compare April 15, 2026 19:42

dennisfrancis requested a review from eszkadev April 15, 2026 19:51

dennisfrancis force-pushed the private/dennisf/jsdialog-ctxtmenu branch from 807bb3c to 3e05872 Compare April 16, 2026 15:33

dennisfrancis force-pushed the private/dennisf/jsdialog-ctxtmenu branch from 3e05872 to 3d9dfbd Compare April 17, 2026 12:35

eszkadev force-pushed the private/dennisf/jsdialog-ctxtmenu branch 2 times, most recently from 2653686 to bfe7fb7 Compare April 17, 2026 16:19

eszkadev previously approved these changes Apr 17, 2026

View reviewed changes

github-project-automation bot moved this from To Review to To Test in Collabora Online Apr 17, 2026

eszkadev requested a review from timar April 17, 2026 16:20

eszkadev changed the title ~~jsdialog based calc tab-bar context menu~~ jsdialog based calc tab-bar, removed jquery-contextmenu Apr 17, 2026

dennisfrancis and others added 7 commits April 19, 2026 18:16

browser: use jsdialog based menu for calc tabs

3259085

This is related to #13948 Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: Ie8b1b0e12946d3a1d87f0104ed174623f068ea89

browser: jsdialog popup: allow bottom anchor

abcb577

Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: Id63728812ce4142a4549fbdedfcf9bde85859c79

browser: calc-tabs: position the popup properly

c36d62f

Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: I668c711dbac98cead4fe2ed3715906b484387f76

cypress: calc-sheet-bar: adapt to jsdialog context menu

b77c3ed

Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: I85462dd7acf2c129dcc402b69dbc068a26772316

browser: remove unused Control.ContextMenu.js

9de7d2e

Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Change-Id: I0dca0b9272935946df30f9684cc5b48feb02b03f

context-menu: remove leftovers

e3524ad

- we no longer use jQuery menu so no need to close it - do not need main level CSS for context menu Signed-off-by: Szymon Kłos <szymon.klos@collabora.com> Change-Id: If7fdc0af34af7d9eb72f7089437ee02f568a34d3

deps: remove jquery-contextmenu

5b1b288

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com> Change-Id: I43cea6c46a1bd30324c3dc77fa5a8434e01095a1

dennisfrancis force-pushed the private/dennisf/jsdialog-ctxtmenu branch from bfe7fb7 to 5b1b288 Compare April 19, 2026 12:48

eszkadev reviewed Apr 20, 2026

View reviewed changes

timar approved these changes Apr 20, 2026

View reviewed changes

Conversation

dennisfrancis commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

Darshan-upadhyay1110 commented Apr 15, 2026

Uh oh!

dennisfrancis commented Apr 15, 2026

Uh oh!

dennisfrancis commented Apr 15, 2026

Uh oh!

eszkadev commented Apr 16, 2026

Uh oh!

dennisfrancis commented Apr 16, 2026

Uh oh!

eszkadev left a comment

Choose a reason for hiding this comment

Uh oh!

dennisfrancis commented Apr 19, 2026

Uh oh!

eszkadev commented Apr 20, 2026

Uh oh!

eszkadev Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

eszkadev Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

eszkadev Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

eszkadev Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

eszkadev Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

eszkadev Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

timar left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dennisfrancis commented Apr 8, 2026 •

edited

Loading