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

Jump to bottom

Issue/562 add underline #1370

Merged
merged 14 commits into from
Oct 4, 2019
Merged

Issue/562 add underline #1370

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a630726
Update Gutenberg version.
SergioEstevao Sep 19, 2019
5035525
Merge branch 'develop' into issue/562_add_underline
SergioEstevao Sep 19, 2019
e267cb3
Update GB reference.
SergioEstevao Sep 20, 2019
66b4f92
Enable the CSSUnderlinePlugin on Aztec Android
daniloercoli Sep 25, 2019
8e187d5
Make sure to handle the new available format `underline`, passed from…
daniloercoli Sep 25, 2019
ec4d74c
Update GB ref
daniloercoli Sep 25, 2019
5b48d58
Update GB reference.
SergioEstevao Sep 25, 2019
f168710
Merge branch 'develop' into issue/562_add_underline
SergioEstevao Sep 25, 2019
b7d3cfd
Update GB reference.
SergioEstevao Sep 26, 2019
3695a12
Merge branch 'develop' into issue/562_add_underline
SergioEstevao Sep 26, 2019
1e3e16a
Update GB reference.
SergioEstevao Sep 27, 2019
545ab3e
Update GB reference.
SergioEstevao Sep 27, 2019
6149454
Merge branch 'develop' into issue/562_add_underline
SergioEstevao Oct 4, 2019
84db3e6
Update Aztec to version 1.10.1
SergioEstevao Oct 4, 2019
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
2 changes: 1 addition & 1 deletion gutenberg
Open in desktop
Submodule gutenberg updated 4 files
+1 −1 packages/block-editor/src/components/rich-text/format-toolbar/index.native.js
+2 −0 packages/format-library/src/default-formats.native.js
+12 −2 packages/format-library/src/underline/index.js
+1 −0 packages/rich-text/src/component/index.native.js
2 changes: 1 addition & 1 deletion ...-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ protected ReactAztecText createViewInstance(ThemedReactContext reactContext) {
new LinkFormatter.LinkStyle(
Color.parseColor("#016087"), true)
));
aztecText.addPlugin(new CssUnderlinePlugin());
return aztecText;
}

Expand Down Expand Up @@ -413,7 +414,6 @@ public void disableGBMode(final ReactAztecText view, boolean disable) {
view.addPlugin(new VideoShortcodePlugin());
view.addPlugin(new AudioShortcodePlugin());
view.addPlugin(new HiddenGutenbergPlugin(view));
view.addPlugin(new CssUnderlinePlugin());
view.setImageGetter(new GlideImageLoader(view.getContext()));
view.setVideoThumbnailGetter(new GlideVideoThumbnailLoader(view.getContext()));
// we need to restart the editor now
Expand Down
4 changes: 4 additions & 0 deletions ...ive-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class ReactAztecText extends AztecText {
put(AztecTextFormat.FORMAT_ITALIC, "italic");
put(AztecTextFormat.FORMAT_CITE, "italic");
put(AztecTextFormat.FORMAT_STRIKETHROUGH, "strikethrough");
put(AztecTextFormat.FORMAT_UNDERLINE, "underline");
}
};

Expand Down Expand Up @@ -481,6 +482,9 @@ public void setActiveFormats(Iterable<String> newFormats) {
case "strikethrough":
newFormatsSet.add(AztecTextFormat.FORMAT_STRIKETHROUGH);
break;
case "underline":
newFormatsSet.add(AztecTextFormat.FORMAT_UNDERLINE);
break;
}
}
selectedStylesSet.removeAll(typingFormatsMap.keySet());
Expand Down