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

Register buttons #130

Merged
merged 30 commits into from
Nov 6, 2020
Merged

Register buttons #130

merged 30 commits into from
Nov 6, 2020

Conversation

ilmartyrk
Copy link
Collaborator

Register toolbar button to add button from config

@JohnMcLear
Copy link
Member

This is way too messy to merge dude, can you tidy it up please?

@ilmartyrk
Copy link
Collaborator Author

@JohnMcLear fixed all conflicts, also added a check to index.js exports.eejsBlock_editbarMenuLeft to ignore the default button if button is defined in settings.json under toolbar config

@JohnMcLear
Copy link
Member

@ilmartyrk it' still showing conficts??? :)

@ilmartyrk
Copy link
Collaborator Author

@JohnMcLear, should be fixed now, I merged the ether/ep_comments master and resolved the conflicts

@JohnMcLear JohnMcLear merged commit 48a03ae into ether:master Nov 6, 2020
@JohnMcLear
Copy link
Member

Please check this with the file menu plugin, it looks like you deleted the ejs that is used by the file menu plugin?

@ilmartyrk
Copy link
Collaborator Author

Oh, ok, sorry about that, I've never used that plugin before, I saw that there were two places where a button was added to the toolbar, as one seemed deprecated and I didn't see any reference to this dd_insert block in the documentation too, I removed it, I'll put it back.

@JohnMcLear
Copy link
Member

No biggy, it's prolly rarely used but best to leave support in :)

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.

None yet

3 participants