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

fix: readonly-buttons-availability #1265

Conversation

SystemChanger
Copy link
Contributor

  1. Fixed INDENT and OUTDENT button availability on toggling read-only mode + onClick/focus/etc.
    image

  2. Fixed undo and redo buttons availability on exiting read-only mode
    image

@JiHong88
Copy link
Owner

@SystemChanger The branch is complicated, so I can't accept the PR.
This command is not executed..
git pull git@github.com:SystemChanger/SunEditor.git fix-readonly-buttons-availability

@SystemChanger
Copy link
Contributor Author

SystemChanger commented Jul 26, 2023

@JiHong88 What do you mean by complicated? Could I see full log if provided?
There is a conflicting dist/suneditor.min.js file, which should be omitted on merge.
Also, you can fully allow changes for this file from the PR, because it is nothing more than a built js. I provide it in PRs so that you can quickly check the new changes without having to build by yourself.
It can be done through "Resolve conflicts" button, isn't it?
image

Will it be ok to use theirs/ours merge strategy?
git pull git@github.com:SystemChanger/SunEditor.git fix-readonly-buttons-availability -X theirs
or
git pull git@github.com:SystemChanger/SunEditor.git fix-readonly-buttons-availability -X ours

Looks like this behavior may be automated for repo by creating .gitattribues with merge strategy for dist folder:
How to Ignore Merge Conflicts for Specific Files in a Git Repository
Don't know whether it will affect the github conflict detection and GUI.

Also, I think there could be a way to automatically build on pull-request approval.

@JiHong88 JiHong88 added this to the 2.45.2 milestone Apr 7, 2024
@JiHong88 JiHong88 closed this Apr 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants