Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Comment section: Use int for part hash. #10965

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −17
Open

Comment section: Use int for part hash. #10965

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed8d58b
Comment section: Use int for part hash.
gokaysatir Jan 20, 2025
241edd6
Postpone importing comments instead of asking the user.
gokaysatir Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions browser/src/canvas/sections/CommentListSection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,17 +2366,6 @@ export class CommentSection extends app.definitions.canvasSectionObject {
this.disableLayoutAnimation = true;
var comment;
if (Comment.isAnyEdit()) {
this.map.uiManager.showConfirmModal(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So probably we should detect when we initiate import or not (as optional param?)
Then we can show the dialog only when needed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have below lines:

			if (refreshAnnotation)
				app.socket.sendMessage('commandvalues command=.uno:ViewAnnotations');

I guess that re-import breaks things. My take is to keep this modal out for now. We have onACKComment and it also seems to do the job.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it is only for now, then would be good to keep strings so we will not lost translations already done.
Could you move it to separate method (not used) - if that's the case. If not we can delete.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, i think refreshAnnotation boolean is somehow needed and it re-imports all the comments. In that case, "importComments" is not something that is called at initialization. All the comments are re-imported when that function is called. Including the one we just created and still editing. So i think we can't have that confirmation modal there.

We need to remove it. Then we can have a better look at the function calls and add something else i guess.

'comments-update',
_('Comments Updated'),
_('Another user has updated comments. Would you like to proceed updating?'),
_('OK'),
() => {
CommentSection.pendingImport = false;
this.clearList();
this.importComments(commentList);
}
);
CommentSection.pendingImport = true;
return;
}
Expand Down
Loading