From 801a5ee13f4486fd8213dd691afa4dd3bca2b91d Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 20 Nov 2020 14:18:29 +0800 Subject: [PATCH] sync --- Roo/bootstrap/Input.js | 3 +- css-bootstrap4/bootstrap.css.map | 2 +- css-bootstrap4/bootstrap.min.css.map | 2 +- css-bootstrap4/roojs-bootstrap-debug.css.map | 2 +- css-bootstrap4/roojs-bootstrap.css.map | 2 +- docs/json/roodata.json | 84 ++++++++++++++++++++ docs/src/Roo_bootstrap_Input.js.html | 2 + docs/src/Roo_bootstrap_TriggerField.js.html | 4 +- docs/symbols/Roo.bootstrap.CheckBox.json | 21 +++-- docs/symbols/Roo.bootstrap.ComboBox.json | 7 ++ docs/symbols/Roo.bootstrap.DateField.json | 21 +++-- docs/symbols/Roo.bootstrap.HtmlEditor.json | 21 +++-- docs/symbols/Roo.bootstrap.Input.json | 21 +++-- docs/symbols/Roo.bootstrap.MoneyField.json | 7 ++ docs/symbols/Roo.bootstrap.MonthField.json | 21 +++-- docs/symbols/Roo.bootstrap.NumberField.json | 21 +++-- docs/symbols/Roo.bootstrap.PhoneInput.json | 21 +++-- docs/symbols/Roo.bootstrap.RadioSet.json | 21 +++-- docs/symbols/Roo.bootstrap.SecurePass.json | 21 +++-- docs/symbols/Roo.bootstrap.TextArea.json | 21 +++-- docs/symbols/Roo.bootstrap.TimeField.json | 21 +++-- docs/symbols/Roo.bootstrap.TriggerField.json | 21 +++-- 22 files changed, 275 insertions(+), 92 deletions(-) diff --git a/Roo/bootstrap/Input.js b/Roo/bootstrap/Input.js index 665b5be46d..f50b0d67cd 100644 --- a/Roo/bootstrap/Input.js +++ b/Roo/bootstrap/Input.js @@ -925,8 +925,7 @@ Roo.extend(Roo.bootstrap.Input, Roo.bootstrap.Component, { return; } - //code - } + if(this.allowBlank && !this.getRawValue().length){ return; } diff --git a/css-bootstrap4/bootstrap.css.map b/css-bootstrap4/bootstrap.css.map index a805a701e6..9459d7bc75 100644 --- a/css-bootstrap4/bootstrap.css.map +++ b/css-bootstrap4/bootstrap.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "bootstrap.css", "sources": [ - "../../../../../tmp/scss3QIii6", + "../../../../../tmp/scsstgMQQt", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/bootstrap/bootstrap.scss", diff --git a/css-bootstrap4/bootstrap.min.css.map b/css-bootstrap4/bootstrap.min.css.map index 50f11aa6e5..63ea4ee477 100644 --- a/css-bootstrap4/bootstrap.min.css.map +++ b/css-bootstrap4/bootstrap.min.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "bootstrap.min.css", "sources": [ - "../../../../../tmp/scss3QIii6", + "../../../../../tmp/scsstgMQQt", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/bootstrap/bootstrap.scss", diff --git a/css-bootstrap4/roojs-bootstrap-debug.css.map b/css-bootstrap4/roojs-bootstrap-debug.css.map index 04408300e9..cf4c35efb1 100644 --- a/css-bootstrap4/roojs-bootstrap-debug.css.map +++ b/css-bootstrap4/roojs-bootstrap-debug.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "roojs-bootstrap-debug.css", "sources": [ - "../../../../../tmp/scssRmAer5", + "../../../../../tmp/scssYzCtPq", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/roojs-bootstrap/roojs-bootstrap.scss", diff --git a/css-bootstrap4/roojs-bootstrap.css.map b/css-bootstrap4/roojs-bootstrap.css.map index 77b460a133..3e9ac26f01 100644 --- a/css-bootstrap4/roojs-bootstrap.css.map +++ b/css-bootstrap4/roojs-bootstrap.css.map @@ -2,7 +2,7 @@ "version": 3, "file": "roojs-bootstrap.css", "sources": [ - "../../../../../tmp/scssRmAer5", + "../../../../../tmp/scssYzCtPq", "../scss/bootstrap/_functions.scss", "../scss/bootstrap/_variables.scss", "../scss/roojs-bootstrap/roojs-bootstrap.scss", diff --git a/docs/json/roodata.json b/docs/json/roodata.json index 31102c9b76..fa1c86b76c 100644 --- a/docs/json/roodata.json +++ b/docs/json/roodata.json @@ -21689,6 +21689,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -23330,6 +23336,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "queryDelay", "type" : "Number", @@ -25497,6 +25509,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -31165,6 +31183,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -32636,6 +32660,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "" + }, { "name" : "readOnly", "type" : "Boolean", @@ -38689,6 +38719,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "queryDelay", "type" : "Number", @@ -39867,6 +39903,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -45052,6 +45094,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -47341,6 +47389,12 @@ "desc" : "default []", "memberOf" : "" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -49919,6 +49973,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -51207,6 +51267,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "pwdStrengths", "type" : "String/Object", @@ -56137,6 +56203,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -57029,6 +57101,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", @@ -57922,6 +58000,12 @@ "desc" : "- placeholder to put in text.", "memberOf" : "Roo.bootstrap.Input" }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input" + }, { "name" : "readOnly", "type" : "Boolean", diff --git a/docs/src/Roo_bootstrap_Input.js.html b/docs/src/Roo_bootstrap_Input.js.html index 4131443351..645b683da8 100644 --- a/docs/src/Roo_bootstrap_Input.js.html +++ b/docs/src/Roo_bootstrap_Input.js.html @@ -33,6 +33,7 @@ * @cfg {String} indicatorpos (left|right) default left * @cfg {String} capture (user|camera) use for file input only. (default empty) * @cfg {String} accept (image|video|audio) use for file input only. (default empty) + * @cfg {Boolean} preventMark Do not show tick or cross if error/success * @cfg {String} align (left|center|right) Default left * @cfg {Boolean} forceFeedback (true|false) Default false @@ -924,6 +925,7 @@ return; } + if(this.allowBlank && !this.getRawValue().length){ return; } diff --git a/docs/src/Roo_bootstrap_TriggerField.js.html b/docs/src/Roo_bootstrap_TriggerField.js.html index 1a7506fe9b..a4a1aaf952 100644 --- a/docs/src/Roo_bootstrap_TriggerField.js.html +++ b/docs/src/Roo_bootstrap_TriggerField.js.html @@ -108,7 +108,7 @@ trigger.applyTo('my-field'); cls: 'glyphicon form-control-feedback' }; - if(this.removable && !this.editable && !this.tickable){ + if(this.removable && !this.editable ){ inputblock = { cls : 'has-feedback', cn : [ @@ -132,7 +132,7 @@ trigger.applyTo('my-field'); } } else { - if(this.removable && !this.editable && !this.tickable){ + if(this.removable && !this.editable ){ inputblock = { cls : 'roo-removable', cn : [ diff --git a/docs/symbols/Roo.bootstrap.CheckBox.json b/docs/symbols/Roo.bootstrap.CheckBox.json index d6663829fb..064bfc19db 100644 --- a/docs/symbols/Roo.bootstrap.CheckBox.json +++ b/docs/symbols/Roo.bootstrap.CheckBox.json @@ -380,13 +380,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -401,6 +394,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -505,6 +505,13 @@ "memberOf" : "Roo.bootstrap.CheckBox", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.ComboBox.json b/docs/symbols/Roo.bootstrap.ComboBox.json index 52d7f13e82..a5ae568f9d 100644 --- a/docs/symbols/Roo.bootstrap.ComboBox.json +++ b/docs/symbols/Roo.bootstrap.ComboBox.json @@ -533,6 +533,13 @@ "memberOf" : "Roo.bootstrap.ComboBox", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "accept", "type" : "String", diff --git a/docs/symbols/Roo.bootstrap.DateField.json b/docs/symbols/Roo.bootstrap.DateField.json index d3fabde5d6..fca08f7668 100644 --- a/docs/symbols/Roo.bootstrap.DateField.json +++ b/docs/symbols/Roo.bootstrap.DateField.json @@ -402,13 +402,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -423,6 +416,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -548,6 +548,13 @@ "memberOf" : "Roo.bootstrap.DateField", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.HtmlEditor.json b/docs/symbols/Roo.bootstrap.HtmlEditor.json index 8aa7e44d5c..547abc6a1f 100644 --- a/docs/symbols/Roo.bootstrap.HtmlEditor.json +++ b/docs/symbols/Roo.bootstrap.HtmlEditor.json @@ -371,13 +371,6 @@ "memberOf" : "Roo.bootstrap.TextArea", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -392,6 +385,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -517,6 +517,13 @@ "memberOf" : "Roo.bootstrap.TextArea", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.Input.json b/docs/symbols/Roo.bootstrap.Input.json index e512524b46..897999307a 100644 --- a/docs/symbols/Roo.bootstrap.Input.json +++ b/docs/symbols/Roo.bootstrap.Input.json @@ -331,13 +331,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -352,6 +345,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -449,6 +449,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.MoneyField.json b/docs/symbols/Roo.bootstrap.MoneyField.json index fba815ffb6..944ed32c9e 100644 --- a/docs/symbols/Roo.bootstrap.MoneyField.json +++ b/docs/symbols/Roo.bootstrap.MoneyField.json @@ -593,6 +593,13 @@ "memberOf" : "Roo.bootstrap.ComboBox", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "accept", "type" : "String", diff --git a/docs/symbols/Roo.bootstrap.MonthField.json b/docs/symbols/Roo.bootstrap.MonthField.json index e2c9a6554b..2b32b5128a 100644 --- a/docs/symbols/Roo.bootstrap.MonthField.json +++ b/docs/symbols/Roo.bootstrap.MonthField.json @@ -339,13 +339,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -360,6 +353,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -457,6 +457,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.NumberField.json b/docs/symbols/Roo.bootstrap.NumberField.json index 7312792ff9..acb05c85d9 100644 --- a/docs/symbols/Roo.bootstrap.NumberField.json +++ b/docs/symbols/Roo.bootstrap.NumberField.json @@ -388,13 +388,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -409,6 +402,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -527,6 +527,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.PhoneInput.json b/docs/symbols/Roo.bootstrap.PhoneInput.json index 3a84c007a1..1a6a2ef09c 100644 --- a/docs/symbols/Roo.bootstrap.PhoneInput.json +++ b/docs/symbols/Roo.bootstrap.PhoneInput.json @@ -367,13 +367,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -388,6 +381,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -499,6 +499,13 @@ "memberOf" : "Roo.bootstrap.PhoneInput", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.RadioSet.json b/docs/symbols/Roo.bootstrap.RadioSet.json index ddeef0f983..3e05b4499d 100644 --- a/docs/symbols/Roo.bootstrap.RadioSet.json +++ b/docs/symbols/Roo.bootstrap.RadioSet.json @@ -355,13 +355,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -376,6 +369,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -473,6 +473,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.SecurePass.json b/docs/symbols/Roo.bootstrap.SecurePass.json index c061980074..f558d595de 100644 --- a/docs/symbols/Roo.bootstrap.SecurePass.json +++ b/docs/symbols/Roo.bootstrap.SecurePass.json @@ -353,13 +353,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -374,6 +367,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -471,6 +471,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.TextArea.json b/docs/symbols/Roo.bootstrap.TextArea.json index 641a130f71..2c201af434 100644 --- a/docs/symbols/Roo.bootstrap.TextArea.json +++ b/docs/symbols/Roo.bootstrap.TextArea.json @@ -356,13 +356,6 @@ "memberOf" : "Roo.bootstrap.TextArea", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -377,6 +370,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -495,6 +495,13 @@ "memberOf" : "Roo.bootstrap.TextArea", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.TimeField.json b/docs/symbols/Roo.bootstrap.TimeField.json index 0ff4155cee..da0386edd6 100644 --- a/docs/symbols/Roo.bootstrap.TimeField.json +++ b/docs/symbols/Roo.bootstrap.TimeField.json @@ -332,13 +332,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -353,6 +346,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -457,6 +457,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", diff --git a/docs/symbols/Roo.bootstrap.TriggerField.json b/docs/symbols/Roo.bootstrap.TriggerField.json index 00b74b8897..35844c4712 100644 --- a/docs/symbols/Roo.bootstrap.TriggerField.json +++ b/docs/symbols/Roo.bootstrap.TriggerField.json @@ -366,13 +366,6 @@ "memberOf" : "Roo.bootstrap.Component", "optvals" : [] }, - { - "name" : "blankText", - "type" : "String", - "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", - "memberOf" : "Roo.bootstrap.Input", - "optvals" : [] - }, { "name" : "before", "type" : "string", @@ -387,6 +380,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "blankText", + "type" : "String", + "desc" : "Error text to display if the allow blank validation fails (defaults to \"This field is required\")", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "selectOnFocus", "type" : "Boolean", @@ -484,6 +484,13 @@ "memberOf" : "Roo.bootstrap.Input", "optvals" : [] }, + { + "name" : "preventMark", + "type" : "Boolean", + "desc" : "Do not show tick or cross if error/success", + "memberOf" : "Roo.bootstrap.Input", + "optvals" : [] + }, { "name" : "forceFeedback", "type" : "Boolean", -- 2.39.2