Skip to content

Commit 2f2a69b

Browse files
committed
Merge branch 'develop' of https://github.com/wordpress-mobile/AztecEditor-Android into issue/1266_allow-paragraph-without-alignment-span
* 'develop' of https://github.com/wordpress-mobile/AztecEditor-Android: Update CHANGELOG and README for v.1.3.31 release (#856) Revert test fix Removed fix for chromebook devices (refresh text on layout change) which introduced nasty bug on editor
2 parents b1fad43 + 20bd6b7 commit 2f2a69b

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Changelog
2+
## [1.3.31](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.31)
3+
### Fixed
4+
- Fix lag deleting and inserting text #853 and #854
5+
16
# Changelog
27
## [1.3.30](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.30)
38
### Added

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ repositories {
105105
```
106106
```gradle
107107
dependencies {
108-
api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.30')
108+
api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.31')
109109
}
110110
```
111111

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -452,17 +452,6 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
452452
isViewInitialized = true
453453
}
454454

455-
override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
456-
// layout is changing when app screen is resized (on Chromebooks, etc.)
457-
// we need to refresh text to reflect visual changes
458-
if (changed) {
459-
post {
460-
refreshText(false)
461-
}
462-
}
463-
super.onLayout(changed, left, top, right, bottom)
464-
}
465-
466455
// Setup the keyListener(s) for Backspace and Enter key.
467456
// Backspace: If listener does return false we remove the style here
468457
// Enter: Ask the listener if we need to insert or not the char

aztec/src/test/kotlin/org/wordpress/aztec/AztecToolbarTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ class AztecToolbarTest {
648648
@Throws(Exception::class)
649649
fun emptySelection() {
650650
editText.fromHtml("<b>bold</b><b><i>italic</i></b>")
651-
editText.fromHtml("", false)
651+
editText.fromHtml("")
652652

653653
Assert.assertTrue(TestUtils.safeEmpty(editText))
654654

0 commit comments

Comments
 (0)