Merge pull request #470 from wordpress-mobile/issue/fix-broken-html-button

Fix broken HTML button

Author: khaykov

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -346,7 +346,7 @@ class MainActivity : AppCompatActivity(),
 
         if (savedInstanceState == null) {
             aztec.visualEditor.fromHtml(aztec.sourceEditor?.getPureHtml()!!)
-            aztec.initHistory()
+            aztec.initSourceEditorHistory()
         }
 
         invalidateOptionsHandler = Handler()
@@ -381,7 +381,7 @@ class MainActivity : AppCompatActivity(),
     override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
         super.onRestoreInstanceState(savedInstanceState)
 
-        aztec.initHistory()
+        aztec.initSourceEditorHistory()
 
         savedInstanceState?.let {
             if (savedInstanceState.getBoolean("isPhotoMediaDialogVisible")) {

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

@@ -26,7 +26,6 @@ open class Aztec private constructor(val visualEditor: AztecText, val toolbar: A
     var sourceEditor: SourceViewEditText? = null
 
     init {
-        initHistory()
         initToolbar()
     }
 
@@ -43,6 +42,9 @@ open class Aztec private constructor(val visualEditor: AztecText, val toolbar: A
     private constructor(visualEditor: AztecText, sourceEditor: SourceViewEditText,
                 toolbar: AztecToolbar, toolbarClickListener: IAztecToolbarClickListener) : this(visualEditor, toolbar, toolbarClickListener) {
         this.sourceEditor = sourceEditor
+
+        initToolbar()
+        initSourceEditorHistory()
     }
 
     companion object Factory {
@@ -58,6 +60,7 @@ open class Aztec private constructor(val visualEditor: AztecText, val toolbar: A
             return Aztec(visualEditor, sourceEditor, toolbar, toolbarClickListener)
         }
 
+        @JvmStatic
         fun with(visualEditor: AztecText, toolbar: AztecToolbar, toolbarClickListener: IAztecToolbarClickListener) : Aztec {
             return Aztec(visualEditor, toolbar, toolbarClickListener)
         }
@@ -127,7 +130,7 @@ open class Aztec private constructor(val visualEditor: AztecText, val toolbar: A
         return this
     }
 
-    fun initHistory() {
+    fun initSourceEditorHistory() {
         sourceEditor?.history = visualEditor.history
     }
 

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        gradlePluginVersion = '3.0.0-beta2'
+        gradlePluginVersion = '3.0.0-beta3'
         kotlinVersion = '1.1.4-2'
         supportLibVersion = '26.0.1'
         tagSoupVersion = '1.2.1'