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.

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

[FW][FIX] BottomBarSheet: Rename a sheet with style content on Firefox #3919

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Mar 25, 2024

The issue addressed in PR #3351 unfortunately used a contentEditable value that is not compatible with Firefox 1

This revision implements the first strategy explored by the aforementioned PR by removing the full format from the contenteditable span when we stop the edition.

Testing required to define some properties as JSdom does not properly support the implementation of innerText (see 2)

Task: 3754944

Description:

description of this task, what is implemented and why it is implemented that way.

Task: : TASK_ID

review checklist

  • feature is organized in plugin, or UI components
  • support of duplicate sheet (deep copy)
  • in model/core: ranges are Range object, and can be adapted (adaptRanges)
  • in model/UI: ranges are strings (to show the user)
  • undo-able commands (uses this.history.update)
  • multiuser-able commands (has inverse commands and transformations where needed)
  • new/updated/removed commands are documented
  • exportable in excel
  • translations (_t("qmsdf %s", abc))
  • unit tested
  • clean commented code
  • track breaking changes
  • doc is rebuild (npm run doc)
  • status is correct in Odoo

Forward-Port-Of: #3915
Forward-Port-Of: #3894

@robodoo
Copy link
Collaborator

robodoo commented Mar 25, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 25, 2024

@rrahir @LucasLefevre cherrypicking of pull request #3894 failed.

stdout:

Auto-merging src/components/bottom_bar_sheet/bottom_bar_sheet.xml
Auto-merging tests/bottom_bar/bottom_bar_component.test.ts
Auto-merging tests/setup/jest.setup.ts
CONFLICT (content): Merge conflict in tests/setup/jest.setup.ts

stderr:

15:51:47.386796 git.c:463               trace: built-in: git cherry-pick 0cf4f2830b7c1edc902490817c6f0e48ac2689de
error: could not apply 0cf4f2830... [FIX] BottomBarSheet: Rename a sheet with style content on Firefox
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

The issue addressed in PR #3351 unfortunately used a
`contentEditable` value that is not compatible with Firefox [1]

This revision implements the first strategy explored by the
aforementioned PR by removing the full format from  the contenteditable
span when we stop the edition.

Testing required to define some properties as JSdom does not properly
support the implementation of innerText (see [2])

[1]: https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/contenteditable#browser_compatibility
[2]: jsdom/jsdom#1245

Task: 3754944
X-original-commit: 91d7a19
@rrahir rrahir force-pushed the 17.0-saas-16.3-make-FF-great-again-rar-9SXW-fw branch from 38072e7 to f83f551 Compare March 25, 2024 14:57
@rrahir
Copy link
Collaborator

rrahir commented Mar 25, 2024

@robodoo r+

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants