aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2018-01-17 19:29:30 +0100
committerRobert Jaros <rjaros@finn.pl>2018-01-17 19:29:30 +0100
commit31c9d3c4121107974a8419752aa7face5c96f821 (patch)
tree77aaac10c5a120b028c14f53ab74eb5491f4a443 /src/main
parent646e82e383850447fd4d10f71ecc0aeab11623e0 (diff)
downloadkvision-31c9d3c4121107974a8419752aa7face5c96f821.tar.gz
kvision-31c9d3c4121107974a8419752aa7face5c96f821.tar.bz2
kvision-31c9d3c4121107974a8419752aa7face5c96f821.zip
Code formatting (Kotlin Style Guide)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/Showcase.kt101
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/core/Css.kt72
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt11
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/core/Widget.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/data/DataContainer.kt12
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/dropdown/DropDown.kt34
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/FieldLabel.kt10
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/Form.kt16
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/FormPanel.kt14
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/HelpBlock.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/check/CheckBox.kt12
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/check/CheckInput.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/check/Radio.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/check/RadioGroup.kt8
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/select/AjaxOptions.kt14
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/select/Select.kt14
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/select/SelectInput.kt10
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/select/SelectOptGroup.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/select/SelectOption.kt8
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/spinner/Spinner.kt12
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/spinner/SpinnerInput.kt10
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/AbstractText.kt2
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/AbstractTextInput.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/Password.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/RichText.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/RichTextInput.kt2
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/Text.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/TextArea.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/TextAreaInput.kt2
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/text/TextInput.kt2
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/time/DateTime.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/form/time/DateTimeInput.kt10
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Button.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Image.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Link.kt8
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/List.kt8
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/html/Tag.kt8
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/modal/Alert.kt16
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/modal/Confirm.kt22
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/modal/Modal.kt8
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/DockPanel.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/FlexPanel.kt24
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/GridPanel.kt32
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/HPanel.kt10
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/ResponsiveGridPanel.kt8
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/SimplePanel.kt2
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/SplitPanel.kt12
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/StackPanel.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/TabPanel.kt6
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/panel/VPanel.kt10
50 files changed, 411 insertions, 229 deletions
diff --git a/src/main/kotlin/pl/treksoft/kvision/Showcase.kt b/src/main/kotlin/pl/treksoft/kvision/Showcase.kt
index d7b76862..51f0213b 100644
--- a/src/main/kotlin/pl/treksoft/kvision/Showcase.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/Showcase.kt
@@ -89,9 +89,11 @@ class Showcase : ApplicationBase() {
val model = observableListOf(Model(true, "Pierwszy"), Model(false, "Drugi"), Model(false, "Trzeci"))
val datac = DataContainer(model, { element, index ->
- CheckBox(value = element.p,
- label = if (element.p) "<b>" + (index + 1) + " " + element.t + "</b>" else element.t,
- rich = true).setEventListener<CheckBox>({
+ CheckBox(
+ value = element.p,
+ label = if (element.p) "<b>" + (index + 1) + " " + element.t + "</b>" else element.t,
+ rich = true
+ ).setEventListener<CheckBox>({
click = {
element.p = self.value
}
@@ -409,12 +411,18 @@ class Showcase : ApplicationBase() {
}*/
root.add(text)
- val textareainput = TextAreaInput(cols = 5, rows = 2, value = "To jest tekst\nTo jest <b>te</b></textarea>kst2").apply {
- placeholder = "..."
- }
+ val textareainput =
+ TextAreaInput(cols = 5, rows = 2, value = "To jest tekst\nTo jest <b>te</b></textarea>kst2").apply {
+ placeholder = "..."
+ }
root.add(textareainput)
- val textarea = TextArea(cols = 5, rows = 2, value = "To jest tekst\nTo jest <b>te</b></textarea>kst2", label = "Pole długie").apply {
+ val textarea = TextArea(
+ cols = 5,
+ rows = 2,
+ value = "To jest tekst\nTo jest <b>te</b></textarea>kst2",
+ label = "Pole długie"
+ ).apply {
placeholder = "..."
}
root.add(textarea)
@@ -447,7 +455,7 @@ class Showcase : ApplicationBase() {
it.getValue()?.matches("^[0-9]+$")
}
add("password", Password(label = "Hasło"), required = true,
- validatorMessage = { "Wprowadź co najmniej 5 znaków" }) {
+ validatorMessage = { "Wprowadź co najmniej 5 znaków" }) {
(it.getValue()?.length ?: 0) >= 5
}
add("textarea", TextArea(label = "Obszar"), required = true)
@@ -455,20 +463,26 @@ class Showcase : ApplicationBase() {
add("data", DateTime(format = "YYYY-MM-DD", label = "Data"), required = true)
add("checkbox", CheckBox(label = "Checkbox")) { it.getValue() }
add("radio", Radio(label = "Radiobutton")) { it.getValue() }
- add("select", Select(options = listOf("a" to "Pierwsza opcja", "b" to "Druga opcja"),
- label = "Wybierz opcje").apply {
+ add("select", Select(
+ options = listOf("a" to "Pierwsza opcja", "b" to "Druga opcja"),
+ label = "Wybierz opcje"
+ ).apply {
// selectWidthType = SELECTWIDTHTYPE.FIT
emptyOption = true
- }, required = true)
+ }, required = true
+ )
add("spinner", Spinner(label = "Spinner"), required = true)
- add("radiogroup", RadioGroup(listOf("o1" to "Pierwsza opcja", "o2" to "Druga opcja"),
- inline = true, label = "Radio group").apply {
+ add("radiogroup", RadioGroup(
+ listOf("o1" to "Pierwsza opcja", "o2" to "Druga opcja"),
+ inline = true, label = "Radio group"
+ ).apply {
setEventListener<RadioGroup> {
change = { e ->
println(self.value)
}
}
- }, required = true)
+ }, required = true
+ )
validator = {
val result = it["text"] == it["textarea"]
@@ -481,7 +495,14 @@ class Showcase : ApplicationBase() {
validatorMessage = { "Pole Tekst i Obszar muszą być takie same!" }
}
root.add(formPanel)
- val spinner = SpinnerInput(15.05, min = -100000, max = 100000, decimals = 4, forceType = FORCETYPE.ROUND, step = 0.0001).apply {
+ val spinner = SpinnerInput(
+ 15.05,
+ min = -100000,
+ max = 100000,
+ decimals = 4,
+ forceType = FORCETYPE.ROUND,
+ step = 0.0001
+ ).apply {
size = INPUTSIZE.LARGE
}
val ttt = TextInput(value = "abc").apply {
@@ -527,9 +548,12 @@ class Showcase : ApplicationBase() {
hiddenBsDropdown = { e -> println("hidden" + e.detail) }
}
- val dd2 = DropDown("Dropdown2", listOf("abc" to "#!/abc", "def" to "#!/def", "xyz" to DISABLED.type,
+ val dd2 = DropDown(
+ "Dropdown2", listOf(
+ "abc" to "#!/abc", "def" to "#!/def", "xyz" to DISABLED.type,
"Header" to HEADER.type, "Separtatorek" to SEPARATOR.type
- ), "flag").apply { dropup = true }
+ ), "flag"
+ ).apply { dropup = true }
root.add(dd2)
dd2.setEventListener<DropDown> {
hideBsDropdown = { e -> println("hide" + e.detail) }
@@ -564,14 +588,20 @@ class Showcase : ApplicationBase() {
split.add(tabs)
val split2 = SplitPanel(DIRECTION.HORIZONTAL)
- val t1 = Tag(TAG.DIV, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce nec fringilla turpis, vel molestie dolor. Vestibulum ut ex eget orci porta gravida eu sit amet tortor. Suspendisse vel fermentum purus, vel ornare tellus. Vivamus dictum, risus non viverra venenatis, magna mi pharetra purus, nec dignissim risus tortor a sem. Donec tincidunt dui ut eros laoreet consectetur. Nam dapibus vestibulum sem, eget accumsan ex vestibulum ac. Curabitur ac mi sit amet eros sodales dictum. Sed at felis at nunc aliquam finibus. Vestibulum lorem nulla, dictum ac libero non, mattis dictum nisl. Aenean semper lorem turpis. Praesent pellentesque ligula est, viverra molestie leo imperdiet ut. Nam vitae hendrerit justo. Nullam tincidunt et nibh ac volutpat. Aliquam vulputate mi aliquam fermentum rhoncus.\n" +
- "\n" +
- "Proin porttitor diam id massa eleifend aliquet. Morbi nec erat porttitor, placerat lorem et, dignissim lectus. Cras ultricies posuere arcu, et pharetra dui laoreet in. Sed nec ipsum in sapien vestibulum maximus eu id nunc. Ut finibus aliquam nisi id vehicula. Phasellus sodales lobortis orci, non interdum risus dignissim quis. Proin bibendum consectetur diam nec mattis. Suspendisse dictum vulputate metus at tincidunt.")
+ val t1 = Tag(
+ TAG.DIV,
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce nec fringilla turpis, vel molestie dolor. Vestibulum ut ex eget orci porta gravida eu sit amet tortor. Suspendisse vel fermentum purus, vel ornare tellus. Vivamus dictum, risus non viverra venenatis, magna mi pharetra purus, nec dignissim risus tortor a sem. Donec tincidunt dui ut eros laoreet consectetur. Nam dapibus vestibulum sem, eget accumsan ex vestibulum ac. Curabitur ac mi sit amet eros sodales dictum. Sed at felis at nunc aliquam finibus. Vestibulum lorem nulla, dictum ac libero non, mattis dictum nisl. Aenean semper lorem turpis. Praesent pellentesque ligula est, viverra molestie leo imperdiet ut. Nam vitae hendrerit justo. Nullam tincidunt et nibh ac volutpat. Aliquam vulputate mi aliquam fermentum rhoncus.\n" +
+ "\n" +
+ "Proin porttitor diam id massa eleifend aliquet. Morbi nec erat porttitor, placerat lorem et, dignissim lectus. Cras ultricies posuere arcu, et pharetra dui laoreet in. Sed nec ipsum in sapien vestibulum maximus eu id nunc. Ut finibus aliquam nisi id vehicula. Phasellus sodales lobortis orci, non interdum risus dignissim quis. Proin bibendum consectetur diam nec mattis. Suspendisse dictum vulputate metus at tincidunt."
+ )
t1.padding = 5.px()
split2.add(t1)
- val t2 = Tag(TAG.DIV, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce nec fringilla turpis, vel molestie dolor. Vestibulum ut ex eget orci porta gravida eu sit amet tortor. Suspendisse vel fermentum purus, vel ornare tellus. Vivamus dictum, risus non viverra venenatis, magna mi pharetra purus, nec dignissim risus tortor a sem. Donec tincidunt dui ut eros laoreet consectetur. Nam dapibus vestibulum sem, eget accumsan ex vestibulum ac. Curabitur ac mi sit amet eros sodales dictum. Sed at felis at nunc aliquam finibus. Vestibulum lorem nulla, dictum ac libero non, mattis dictum nisl. Aenean semper lorem turpis. Praesent pellentesque ligula est, viverra molestie leo imperdiet ut. Nam vitae hendrerit justo. Nullam tincidunt et nibh ac volutpat. Aliquam vulputate mi aliquam fermentum rhoncus.\n" +
- "\n" +
- "Proin porttitor diam id massa eleifend aliquet. Morbi nec erat porttitor, placerat lorem et, dignissim lectus. Cras ultricies posuere arcu, et pharetra dui laoreet in. Sed nec ipsum in sapien vestibulum maximus eu id nunc. Ut finibus aliquam nisi id vehicula. Phasellus sodales lobortis orci, non interdum risus dignissim quis. Proin bibendum consectetur diam nec mattis. Suspendisse dictum vulputate metus at tincidunt.")
+ val t2 = Tag(
+ TAG.DIV,
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce nec fringilla turpis, vel molestie dolor. Vestibulum ut ex eget orci porta gravida eu sit amet tortor. Suspendisse vel fermentum purus, vel ornare tellus. Vivamus dictum, risus non viverra venenatis, magna mi pharetra purus, nec dignissim risus tortor a sem. Donec tincidunt dui ut eros laoreet consectetur. Nam dapibus vestibulum sem, eget accumsan ex vestibulum ac. Curabitur ac mi sit amet eros sodales dictum. Sed at felis at nunc aliquam finibus. Vestibulum lorem nulla, dictum ac libero non, mattis dictum nisl. Aenean semper lorem turpis. Praesent pellentesque ligula est, viverra molestie leo imperdiet ut. Nam vitae hendrerit justo. Nullam tincidunt et nibh ac volutpat. Aliquam vulputate mi aliquam fermentum rhoncus.\n" +
+ "\n" +
+ "Proin porttitor diam id massa eleifend aliquet. Morbi nec erat porttitor, placerat lorem et, dignissim lectus. Cras ultricies posuere arcu, et pharetra dui laoreet in. Sed nec ipsum in sapien vestibulum maximus eu id nunc. Ut finibus aliquam nisi id vehicula. Phasellus sodales lobortis orci, non interdum risus dignissim quis. Proin bibendum consectetur diam nec mattis. Suspendisse dictum vulputate metus at tincidunt."
+ )
t2.padding = 10.px()
split2.add(t2)
split.add(split2)
@@ -596,8 +626,12 @@ class Showcase : ApplicationBase() {
val del = Tag(TAG.DEL, "To jest deleted")
root.add(del)
- val list = ListTag(LIST.DL_HORIZ, listOf("abc", "de<b>fdasdasdasddasd</b>tdasdas", "Dasdsada",
- "dasdasdads"), true)
+ val list = ListTag(
+ LIST.DL_HORIZ, listOf(
+ "abc", "de<b>fdasdasdasddasd</b>tdasdas", "Dasdsada",
+ "dasdasdads"
+ ), true
+ )
root.add(list)
val list2 = ListTag(LIST.OL, null)
@@ -642,8 +676,10 @@ class Showcase : ApplicationBase() {
root.add(vPanel)
val grid3 = GridPanel(templateColumns = "1fr 1fr 1fr")
- grid3.background = Background(0xCCCCCC, Img("kotlin.png"), 50.perc(), 50.perc(), size = BGSIZE.CONTAIN,
- repeat = BGREPEAT.NOREPEAT, attachment = BGATTACH.FIXED)
+ grid3.background = Background(
+ 0xCCCCCC, Img("kotlin.png"), 50.perc(), 50.perc(), size = BGSIZE.CONTAIN,
+ repeat = BGREPEAT.NOREPEAT, attachment = BGATTACH.FIXED
+ )
grid3.add(Label("hh1"))
grid3.add(Label("hh2"))
grid3.add(Label("hh3"))
@@ -669,7 +705,10 @@ class Showcase : ApplicationBase() {
// root.add(dock)
val pa = HPanel(alignItems = FLEXALIGNITEMS.FLEXEND)
- pa.add(Label("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce nec fringilla turpis, vel molestie dolor. Vestibulum ut ex eget orci porta gravida eu sit amet tortor. Suspendisse vel fermentum purus, vel ornare tellus. Vivamus dictum, risus non viverra venenatis, magna mi pharetra purus, nec dignissim risus tortor a sem. Donec tincidunt dui ut eros laoreet consectetur. Nam dapibus vestibulum sem, eget accumsan ex vestibulum ac. Curabitur ac mi sit amet eros sodales dictum. Sed at felis at nunc aliquam finibus. Vestibulum lorem nulla, dictum ac libero non, mattis dictum nisl. Aenean semper lorem turpis. Praesent pellentesque ligula est, viverra molestie leo imperdiet ut. Nam vitae hendrerit justo. Nullam tincidunt et nibh ac volutpat. Aliquam vulputate mi aliquam fermentum rhoncus."), 3)
+ pa.add(
+ Label("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce nec fringilla turpis, vel molestie dolor. Vestibulum ut ex eget orci porta gravida eu sit amet tortor. Suspendisse vel fermentum purus, vel ornare tellus. Vivamus dictum, risus non viverra venenatis, magna mi pharetra purus, nec dignissim risus tortor a sem. Donec tincidunt dui ut eros laoreet consectetur. Nam dapibus vestibulum sem, eget accumsan ex vestibulum ac. Curabitur ac mi sit amet eros sodales dictum. Sed at felis at nunc aliquam finibus. Vestibulum lorem nulla, dictum ac libero non, mattis dictum nisl. Aenean semper lorem turpis. Praesent pellentesque ligula est, viverra molestie leo imperdiet ut. Nam vitae hendrerit justo. Nullam tincidunt et nibh ac volutpat. Aliquam vulputate mi aliquam fermentum rhoncus."),
+ 3
+ )
pa.add(Image(Img("kotlin.png")), 1)
pa.add(dock, 2, alignSelf = FLEXALIGNITEMS.FLEXSTART)
dock.width = 400.px()
@@ -751,9 +790,9 @@ class Showcase : ApplicationBase() {
println("init routing")
routing.on({ _ -> println("root") })
- .on("/abc", { _ -> println("abc") })
- .on("/test", { _ -> println("test") })
- .resolve()
+ .on("/abc", { _ -> println("abc") })
+ .on("/test", { _ -> println("test") })
+ .resolve()
// jQuery(document).off(".data-api")
// routing.on(RegExp("/abc/def/(.*)/(.*)/(.*)"), { x,y,z,u,v -> println(x) })
diff --git a/src/main/kotlin/pl/treksoft/kvision/core/Css.kt b/src/main/kotlin/pl/treksoft/kvision/core/Css.kt
index a645ac83..f533ebdd 100644
--- a/src/main/kotlin/pl/treksoft/kvision/core/Css.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/core/Css.kt
@@ -211,11 +211,15 @@ enum class BGCLIP(val clip: String) {
CONTENT("content-box")
}
-class Border private constructor(private val width: CssSize? = null, private val style: BORDERSTYLE? = null,
- private val color: String? = null) {
+class Border private constructor(
+ private val width: CssSize? = null, private val style: BORDERSTYLE? = null,
+ private val color: String? = null
+) {
constructor(width: CssSize? = null, style: BORDERSTYLE? = null) : this(width, style, null)
- constructor(width: CssSize? = null, style: BORDERSTYLE? = null, color: Int) : this(width, style,
- "#" + color.toHexString())
+ constructor(width: CssSize? = null, style: BORDERSTYLE? = null, color: Int) : this(
+ width, style,
+ "#" + color.toHexString()
+ )
constructor(width: CssSize? = null, style: BORDERSTYLE? = null, color: COLOR) : this(width, style, color.color)
@@ -236,31 +240,45 @@ class Color private constructor(private val color: String? = null) {
}
}
-class Background private constructor(private val color: String? = null, private val image: ResString? = null,
- private val positionX: CssSize? = null, private val positionY: CssSize? = null,
- private val sizeX: CssSize? = null, private val sizeY: CssSize? = null,
- private val size: BGSIZE? = null, private val repeat: BGREPEAT? = null,
- private val origin: BGORIGIN? = null, private val clip: BGCLIP? = null,
- private val attachment: BGATTACH? = null) {
- constructor(image: ResString? = null, positionX: CssSize? = null, positionY: CssSize? = null,
- sizeX: CssSize? = null, sizeY: CssSize? = null, size: BGSIZE? = null,
- repeat: BGREPEAT? = null, origin: BGORIGIN? = null, clip: BGCLIP? = null,
- attachment: BGATTACH? = null) : this(null,
- image, positionX, positionY, sizeX, sizeY, size, repeat, origin, clip, attachment)
+class Background private constructor(
+ private val color: String? = null, private val image: ResString? = null,
+ private val positionX: CssSize? = null, private val positionY: CssSize? = null,
+ private val sizeX: CssSize? = null, private val sizeY: CssSize? = null,
+ private val size: BGSIZE? = null, private val repeat: BGREPEAT? = null,
+ private val origin: BGORIGIN? = null, private val clip: BGCLIP? = null,
+ private val attachment: BGATTACH? = null
+) {
+ constructor(
+ image: ResString? = null, positionX: CssSize? = null, positionY: CssSize? = null,
+ sizeX: CssSize? = null, sizeY: CssSize? = null, size: BGSIZE? = null,
+ repeat: BGREPEAT? = null, origin: BGORIGIN? = null, clip: BGCLIP? = null,
+ attachment: BGATTACH? = null
+ ) : this(
+ null,
+ image, positionX, positionY, sizeX, sizeY, size, repeat, origin, clip, attachment
+ )
- constructor(color: Int, image: ResString? = null, positionX: CssSize? = null,
- positionY: CssSize? = null,
- sizeX: CssSize? = null, sizeY: CssSize? = null, size: BGSIZE? = null,
- repeat: BGREPEAT? = null, origin: BGORIGIN? = null, clip: BGCLIP? = null,
- attachment: BGATTACH? = null) : this("#" +
- color.toHexString(), image, positionX, positionY, sizeX, sizeY, size, repeat, origin, clip,
- attachment)
+ constructor(
+ color: Int, image: ResString? = null, positionX: CssSize? = null,
+ positionY: CssSize? = null,
+ sizeX: CssSize? = null, sizeY: CssSize? = null, size: BGSIZE? = null,
+ repeat: BGREPEAT? = null, origin: BGORIGIN? = null, clip: BGCLIP? = null,
+ attachment: BGATTACH? = null
+ ) : this(
+ "#" +
+ color.toHexString(), image, positionX, positionY, sizeX, sizeY, size, repeat, origin, clip,
+ attachment
+ )
- constructor(color: COLOR, image: ResString? = null, positionX: CssSize? = null,
- positionY: CssSize? = null, sizeX: CssSize? = null, sizeY: CssSize? = null,
- size: BGSIZE? = null, repeat: BGREPEAT? = null, origin: BGORIGIN? = null, clip: BGCLIP? = null,
- attachment: BGATTACH? = null) : this(color.color, image,
- positionX, positionY, sizeX, sizeY, size, repeat, origin, clip, attachment)
+ constructor(
+ color: COLOR, image: ResString? = null, positionX: CssSize? = null,
+ positionY: CssSize? = null, sizeX: CssSize? = null, sizeY: CssSize? = null,
+ size: BGSIZE? = null, repeat: BGREPEAT? = null, origin: BGORIGIN? = null, clip: BGCLIP? = null,
+ attachment: BGATTACH? = null
+ ) : this(
+ color.color, image,
+ positionX, positionY, sizeX, sizeY, size, repeat, origin, clip, attachment
+ )
fun asString(): String {
val img = image?.let {
diff --git a/src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt b/src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt
index 6739192d..4cd50550 100644
--- a/src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt
@@ -26,7 +26,8 @@ object KVManager {
private val bootstrapSelectI18n = require("./js/bootstrap-select-i18n.min.js")
private val bootstrapSelectAjaxCss = require("ajax-bootstrap-select/dist/css/ajax-bootstrap-select.min.css")
private val bootstrapSelectAjax = require("ajax-bootstrap-select/dist/js/ajax-bootstrap-select.min.js")
- private val bootstrapSelectAjaxI18n = require("ajax-bootstrap-select/dist/js/locale/ajax-bootstrap-select.pl-PL.min.js")
+ private val bootstrapSelectAjaxI18n =
+ require("ajax-bootstrap-select/dist/js/locale/ajax-bootstrap-select.pl-PL.min.js")
private val trixCss = require("trix/dist/trix.css")
private val trix = require("trix")
private val bootstrapDateTimePickerCss = require("bootstrap-datetime-picker/css/bootstrap-datetimepicker.min.css")
@@ -35,8 +36,12 @@ object KVManager {
private val bootstrapTouchspin = require("bootstrap-touchspin/dist/jquery.bootstrap-touchspin.min.js")
internal val fecha = require("fecha")
- private val sdPatch = Snabbdom.init(arrayOf(classModule, attributesModule, propsModule, styleModule,
- eventListenersModule, datasetModule))
+ private val sdPatch = Snabbdom.init(
+ arrayOf(
+ classModule, attributesModule, propsModule, styleModule,
+ eventListenersModule, datasetModule
+ )
+ )
private val sdVirtualize = require("snabbdom-virtualize/strings").default
private val styleCss = require("./css/style.css")
diff --git a/src/main/kotlin/pl/treksoft/kvision/core/Widget.kt b/src/main/kotlin/pl/treksoft/kvision/core/Widget.kt
index 8a7dfd15..28b0a076 100644
--- a/src/main/kotlin/pl/treksoft/kvision/core/Widget.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/core/Widget.kt
@@ -349,8 +349,10 @@ open class Widget(classes: Set<String> = setOf()) : StyledComponent() {
return this.parent?.getRoot()
}
- protected open fun createLabelWithIcon(label: String, icon: String? = null,
- image: ResString? = null): Array<out Any> {
+ protected open fun createLabelWithIcon(
+ label: String, icon: String? = null,
+ image: ResString? = null
+ ): Array<out Any> {
return if (icon != null) {
if (icon.startsWith("fa-")) {
arrayOf(KVManager.virtualize("<i class='fa $icon fa-lg'></i>"), " " + label)
diff --git a/src/main/kotlin/pl/treksoft/kvision/data/DataContainer.kt b/src/main/kotlin/pl/treksoft/kvision/data/DataContainer.kt
index 019ee414..4dbceaea 100644
--- a/src/main/kotlin/pl/treksoft/kvision/data/DataContainer.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/data/DataContainer.kt
@@ -2,15 +2,17 @@ package pl.treksoft.kvision.data
import com.github.snabbdom.VNode
import com.lightningkite.kotlin.observable.list.ObservableList
-import pl.treksoft.kvision.core.Container
import pl.treksoft.kvision.core.Component
+import pl.treksoft.kvision.core.Container
import pl.treksoft.kvision.core.Widget
import pl.treksoft.kvision.panel.VPanel
-class DataContainer<M : DataComponent, C : Widget>(val model: ObservableList<M>,
- private val binding: (M, Int) -> C,
- private val child: Container = VPanel()) :
- Widget(setOf()), Container, DataUpdatable {
+class DataContainer<M : DataComponent, C : Widget>(
+ val model: ObservableList<M>,
+ private val binding: (M, Int) -> C,
+ private val child: Container = VPanel()
+) :
+ Widget(setOf()), Container, DataUpdatable {
override var visible
get() = child.visible
diff --git a/src/main/kotlin/pl/treksoft/kvision/dropdown/DropDown.kt b/src/main/kotlin/pl/treksoft/kvision/dropdown/DropDown.kt
index 880cb436..53d722b1 100644
--- a/src/main/kotlin/pl/treksoft/kvision/dropdown/DropDown.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/dropdown/DropDown.kt
@@ -21,9 +21,11 @@ enum class DD(val type: String) {
SEPARATOR("DD#SEPARATOR")
}
-open class DropDown(text: String, elements: List<StringPair>? = null, icon: String? = null,
- style: BUTTONSTYLE = BUTTONSTYLE.DEFAULT, disabled: Boolean = false,
- classes: Set<String> = setOf()) : SimplePanel(classes) {
+open class DropDown(
+ text: String, elements: List<StringPair>? = null, icon: String? = null,
+ style: BUTTONSTYLE = BUTTONSTYLE.DEFAULT, disabled: Boolean = false,
+ classes: Set<String> = setOf()
+) : SimplePanel(classes) {
var text
get() = button.text
set(value) {
@@ -71,8 +73,10 @@ open class DropDown(text: String, elements: List<StringPair>? = null, icon: Stri
}
private val idc = "kv_dropdown_" + counter
- internal val button: Drop