diff options
| author | Robert Jaros <rjaros@finn.pl> | 2019-10-05 20:48:13 +0200 |
|---|---|---|
| committer | Robert Jaros <rjaros@finn.pl> | 2019-10-05 20:48:13 +0200 |
| commit | e31b14957b2cf7aaa1cbd5ec1cdd084b111062e7 (patch) | |
| tree | 860504ecd3d93a033baa86724d873591eb0e1044 /kvision-modules/kvision-bootstrap-upload/src/main/kotlin | |
| parent | de2f1d40df85ad7b2fcdcac93151bf499a391ba9 (diff) | |
| download | kvision-e31b14957b2cf7aaa1cbd5ec1cdd084b111062e7.tar.gz kvision-e31b14957b2cf7aaa1cbd5ec1cdd084b111062e7.tar.bz2 kvision-e31b14957b2cf7aaa1cbd5ec1cdd084b111062e7.zip | |
Updated Upload form control.
Diffstat (limited to 'kvision-modules/kvision-bootstrap-upload/src/main/kotlin')
2 files changed, 7 insertions, 4 deletions
diff --git a/kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/KVManagerUpload.kt b/kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/KVManagerUpload.kt index f3370743..1d8f05b0 100644 --- a/kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/KVManagerUpload.kt +++ b/kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/KVManagerUpload.kt @@ -30,7 +30,7 @@ internal object KVManagerUpload { init { require("bootstrap-fileinput/css/fileinput.min.css") - require("bootstrap-fileinput/themes/explorer-fa/theme.min.css") + require("bootstrap-fileinput/themes/explorer-fas/theme.min.css") require("bootstrap-fileinput") require("./js/locales/bootstrap-fileinput/ar.js") require("./js/locales/bootstrap-fileinput/az.js") @@ -51,7 +51,7 @@ internal object KVManagerUpload { require("./js/locales/bootstrap-fileinput/it.js") require("./js/locales/bootstrap-fileinput/ja.js") require("./js/locales/bootstrap-fileinput/ka.js") - require("./js/locales/bootstrap-fileinput/ko.js") + require("./js/locales/bootstrap-fileinput/kr.js") require("./js/locales/bootstrap-fileinput/kz.js") require("./js/locales/bootstrap-fileinput/lt.js") require("./js/locales/bootstrap-fileinput/nl.js") @@ -68,7 +68,8 @@ internal object KVManagerUpload { require("./js/locales/bootstrap-fileinput/uk.js") require("./js/locales/bootstrap-fileinput/vi.js") require("./js/locales/bootstrap-fileinput/zh.js") - require("bootstrap-fileinput/themes/explorer-fa/theme.min.js") + require("bootstrap-fileinput/themes/explorer-fas/theme.min.js") + require("bootstrap-fileinput/themes/fas/theme.min.js") } internal fun init() {} diff --git a/kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt b/kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt index 71e00ede..faae5274 100644 --- a/kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt +++ b/kvision-modules/kvision-bootstrap-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt @@ -298,7 +298,7 @@ open class UploadInput(uploadUrl: String? = null, multiple: Boolean = false, cla return obj { this.uploadUrl = uploadUrl this.uploadExtraData = uploadExtraData ?: undefined - this.theme = if (explorerTheme) "explorer-fa" else null + this.theme = if (explorerTheme) "explorer-fas" else "fas" this.required = required this.showCaption = showCaption this.showPreview = showPreview @@ -315,6 +315,8 @@ open class UploadInput(uploadUrl: String? = null, multiple: Boolean = false, cla this.showUpload = showUpload this.showRemove = showRemove } + this.autoOrientImage = false + this.purifyHtml = false this.language = language } } |