From 6b53324c97bfc80ed14dfca6a5dbc879950715b9 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Thu, 3 Oct 2019 19:03:21 +0200
Subject: Upgrade to Bootstrap 4. Upgrade to Font Awesome 5. Restructure
 modules.

---
 .../src/main/kotlin/pl/treksoft/kvision/KVManagerRichText.kt   | 10 +++-------
 .../src/main/kotlin/pl/treksoft/kvision/form/text/RichText.kt  |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'kvision-modules/kvision-richtext/src/main/kotlin/pl')

diff --git a/kvision-modules/kvision-richtext/src/main/kotlin/pl/treksoft/kvision/KVManagerRichText.kt b/kvision-modules/kvision-richtext/src/main/kotlin/pl/treksoft/kvision/KVManagerRichText.kt
index c7cd444c..b1b624eb 100644
--- a/kvision-modules/kvision-richtext/src/main/kotlin/pl/treksoft/kvision/KVManagerRichText.kt
+++ b/kvision-modules/kvision-richtext/src/main/kotlin/pl/treksoft/kvision/KVManagerRichText.kt
@@ -30,15 +30,10 @@ internal val kVManagerRichTextInit = KVManagerRichText.init()
 /**
  * Internal singleton object which initializes and configures KVision RichText module.
  */
-@Suppress("EmptyCatchBlock", "TooGenericExceptionCaught")
 internal object KVManagerRichText {
-    fun init() {}
 
-    private val trixCss = try {
+    init {
         require("trix/dist/trix.css")
-    } catch (e: Throwable) {
-    }
-    private val trix = try {
         val trix = require("trix")
         window.asDynamic().Trix = trix
         trix.config.languages = obj {}
@@ -59,6 +54,7 @@ internal object KVManagerRichText {
             orig()
         }
         require("./js/locales/trix/trix.pl.js")
-    } catch (e: Throwable) {
     }
+
+    internal fun init() {}
 }
diff --git a/kvision-modules/kvision-richtext/src/main/kotlin/pl/treksoft/kvision/form/text/RichText.kt b/kvision-modules/kvision-richtext/src/main/kotlin/pl/treksoft/kvision/form/text/RichText.kt
index 22126797..04a02279 100644
--- a/kvision-modules/kvision-richtext/src/main/kotlin/pl/treksoft/kvision/form/text/RichText.kt
+++ b/kvision-modules/kvision-richtext/src/main/kotlin/pl/treksoft/kvision/form/text/RichText.kt
@@ -55,7 +55,7 @@ open class RichText(
         @Suppress("LeakingThis")
         input.eventTarget = this
         this.addInternal(input)
-        this.addInternal(validationInfo)
+        this.addInternal(invalidFeedback)
     }
 
     companion object {
-- 
cgit