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

Add inlineToolbar property #1293

Merged
merged 31 commits into from
Oct 2, 2020
Merged

Add inlineToolbar property #1293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f8faaad
Add inlineToolbar property
ranemihir Aug 31, 2020
051bc57
Fix lint errors
ranemihir Aug 31, 2020
7bf3341
Fix comments
ranemihir Aug 31, 2020
6744721
Sort Tools Working, Can be optimized further
ranemihir Sep 1, 2020
51bc0da
Merge branch 'issue1056/fix-inline-toolbar-order' of https://github.c…
ranemihir Sep 1, 2020
838dee6
Fix dataset error and use children
ranemihir Sep 1, 2020
9cab516
Fix lint errors
ranemihir Sep 1, 2020
d28fe85
Add as improvement to CHNAGELOG.md
ranemihir Sep 1, 2020
4181f4a
Merge branch 'next' into pr/1293
neSpecc Sep 2, 2020
948d411
Fix comments
ranemihir Sep 2, 2020
5d0536e
Add comments and small fixes
ranemihir Sep 3, 2020
905dfff
Merge branch 'issue1056/fix-inline-toolbar-order' of https://github.c…
ranemihir Sep 3, 2020
05f0900
Fix lint errors
ranemihir Sep 3, 2020
8b40116
Fix sortTools() and check inlineToolbar property
ranemihir Sep 7, 2020
08c8087
Fix lint errors
ranemihir Sep 7, 2020
0864ee8
Fix conditions and property names
ranemihir Sep 9, 2020
85dc5e9
Separate block toggler from buttons list in ui
ranemihir Sep 9, 2020
81d4572
Fix lint errors
ranemihir Sep 9, 2020
b8be2e1
Fix condition names in allowedToShow()
ranemihir Sep 11, 2020
3d46ea6
Minor bug fixes
ranemihir Sep 28, 2020
341aa71
Fix linter warnings
ranemihir Sep 28, 2020
fd36aa9
Update docs/CHANGELOG.md
ranemihir Sep 30, 2020
efcdec2
create inlineToolbarSettings() method
ranemihir Sep 30, 2020
8ad0a62
Merge branch 'issue1056/fix-inline-toolbar-order' of https://github.c…
ranemihir Sep 30, 2020
33c04ea
Minor fixes
ranemihir Oct 1, 2020
212fc78
Clearify boolean casting
ranemihir Oct 1, 2020
2bcd21a
Merge branch 'next' into pr/1293
neSpecc Oct 1, 2020
6c0a3db
upd bundle
neSpecc Oct 1, 2020
aa6195b
fix getInlineToolbarSettings
neSpecc Oct 1, 2020
b6726fa
refactor & create new instance every showing
neSpecc Oct 1, 2020
5ca80dc
remove unused codee
neSpecc Oct 2, 2020
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
Prev Previous commit
Next Next commit
upd bundle
  • Loading branch information
@neSpecc
neSpecc committed Oct 1, 2020
commit 6c0a3dbc9fcedeed04dad899d87e3592b30c0bee
2 changes: 1 addition & 1 deletion dist/editor.js
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions src/components/modules/toolbar/inline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,16 @@ export default class InlineToolbar extends Module<InlineToolbarNodes> {
return this.nodes.wrapper.contains(node);
}

/**
* Removes UI and its components
*/
public destroy(): void {
this.flipper.deactivate();
this.flipper = null;

this.Editor.ConversionToolbar.destroy();
}

/**
* Returns inline toolbar for a particular tool
*
Expand Down Expand Up @@ -325,16 +335,6 @@ export default class InlineToolbar extends Module<InlineToolbarNodes> {
return defaultInlineToolbar && isInlineToolbarSettingsForToolTrueOrUndefined;
}

/**
* Removes UI and its components
*/
public destroy(): void {
this.flipper.deactivate();
this.flipper = null;

this.Editor.ConversionToolbar.destroy();
}

/**
* Making DOM
*/
Expand Down