aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2018-01-17 19:24:51 +0100
committerRobert Jaros <rjaros@finn.pl>2018-01-17 19:24:51 +0100
commit646e82e383850447fd4d10f71ecc0aeab11623e0 (patch)
tree9455b0b14d14d4640a9d73756734822a6cd90fbf
parent544703dbc099c09ac849fd160080d9d96b524c48 (diff)
downloadkvision-646e82e383850447fd4d10f71ecc0aeab11623e0.tar.gz
kvision-646e82e383850447fd4d10f71ecc0aeab11623e0.tar.bz2
kvision-646e82e383850447fd4d10f71ecc0aeab11623e0.zip
Plugins and deps version upgrade
-rw-r--r--build.gradle8
-rw-r--r--src/main/assets/js/ajax-bootstrap-select.pl-PL.js88
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt2
3 files changed, 7 insertions, 91 deletions
diff --git a/build.gradle b/build.gradle
index eea5d96c..fc703e2f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.2.10'
+ ext.kotlin_version = '1.2.20'
repositories {
jcenter()
@@ -73,8 +73,12 @@ kotlinFrontend {
}
+jar {
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
detekt {
- version = "1.0.0.RC4-2"
+ version = "1.0.0.RC6-2"
profile("main") {
input = "$projectDir/src/main/kotlin"
config = "$projectDir/detekt.yml"
diff --git a/src/main/assets/js/ajax-bootstrap-select.pl-PL.js b/src/main/assets/js/ajax-bootstrap-select.pl-PL.js
deleted file mode 100644
index 3006d5af..00000000
--- a/src/main/assets/js/ajax-bootstrap-select.pl-PL.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * Ajax Bootstrap Select
- *
- * Extends existing [Bootstrap Select] implementations by adding the ability to search via AJAX requests as you type. Originally for CROSCON.
- *
- * @version 1.4.2
- * @author Adam Heim - https://github.com/truckingsim
- * @link https://github.com/truckingsim/Ajax-Bootstrap-Select
- * @copyright 2017 Adam Heim
- * @license Released under the MIT license.
- *
- * Contributors:
- * Mark Carver - https://github.com/markcarver
- *
- * Last build: 2017-11-01 11:24:59 AM EDT
- */
-!(function ($) {
-/*!
- * Polish translation for the "pl-PL" and "pl" language codes.
- * Robert Jaros <rjaros@treksoft.pl>
-*/
-$.fn.ajaxSelectPicker.locale['pl-PL'] = {
- /**
- * @member $.fn.ajaxSelectPicker.locale
- * @cfg {String} currentlySelected = 'Currently Selected'
- * @markdown
- * The text to use for the label of the option group when currently selected options are preserved.
- */
- currentlySelected: 'Aktualnie wybrane',
-
- /**
- * @member $.fn.ajaxSelectPicker.locale
- * @cfg {String} emptyTitle = 'Select and begin typing'
- * @markdown
- * The text to use as the title for the select element when there are no items to display.
- */
- emptyTitle: 'Wybierz i zacznij pisać',
-
- /**
- * @member $.fn.ajaxSelectPicker.locale
- * @cfg {String} errorText = ''Unable to retrieve results'
- * @markdown
- * The text to use in the status container when a request returns with an error.
- */
- errorText: 'Nie udało się pobrać wyników',
-
- /**
- * @member $.fn.ajaxSelectPicker.locale
- * @cfg {String} searchPlaceholder = 'Search...'
- * @markdown
- * The text to use for the search input placeholder attribute.
- */
- searchPlaceholder: 'Szukaj...',
-
- /**
- * @member $.fn.ajaxSelectPicker.locale
- * @cfg {String} statusInitialized = 'Start typing a search query'
- * @markdown
- * The text used in the status container when it is initialized.
- */
- statusInitialized: 'Zacznij pisać warunek wyszukiwania',
-
- /**
- * @member $.fn.ajaxSelectPicker.locale
- * @cfg {String} statusNoResults = 'No Results'
- * @markdown
- * The text used in the status container when the request returns no results.
- */
- statusNoResults: 'Brak wyników',
-
- /**
- * @member $.fn.ajaxSelectPicker.locale
- * @cfg {String} statusSearching = 'Searching...'
- * @markdown
- * The text to use in the status container when a request is being initiated.
- */
- statusSearching: 'Szukam...',
-
- /**
- * @member $.fn.ajaxSelectPicker.locale
- * @cfg {String} statusTooShort = 'Please enter more characters'
- * @markdown
- * The text used in the status container when the request returns no results.
- */
- statusTooShort: 'Wprowadź więcej znaków'
-};
-$.fn.ajaxSelectPicker.locale.pl = $.fn.ajaxSelectPicker.locale['pl-PL'];
-})(jQuery);
diff --git a/src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt b/src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt
index 0c010553..6739192d 100644
--- a/src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/core/KVManager.kt
@@ -26,7 +26,7 @@ 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("./js/ajax-bootstrap-select.pl-PL.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")