Skip to content

Commit

Permalink
revert bs3 form validation icon display and clean up bs4 validation i…
Browse files Browse the repository at this point in the history 
…con since it's now part of bs4
  • Loading branch information
@dleffler
dleffler committed Mar 21, 2019
1 parent bb5f232 commit e8f8fd8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
24 changes: 12 additions & 12 deletions framework/core/forms/form.php
View file
Expand Up @@ -376,17 +376,17 @@ function toHTML($form_id = null) {
$(element).closest('form').addClass('was-validated');
// move backward to label and set to invalid
$(element).parent().find('label').removeClass('valid-feedback').addClass('invalid-feedback');
$(element).closest('.form-group').find('i.fa.valid-feedback').remove();
$(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fas fa-exclamation fa-lg invalid-feedback\"></i>');
},
unhighlight: function(element, errorClass, validClass) {
// mark form as validated
$(element).closest('form').addClass('was-validated');
// move backward to label and set to valid
$(element).parent().find('label').removeClass('invalid-feedback').addClass('valid-feedback');
$(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
$(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fas fa-check fa-lg valid-feedback\"></i>');
},
errorElement: 'small',
Expand Down Expand Up @@ -420,12 +420,12 @@ function toHTML($form_id = null) {
highlight: function(element, errorClass, validClass) {
$(element).closest('.form-group').removeClass('has-success').addClass('has-error').addClass('has-feedback');
$(element).closest('.form-group').find('i.fa.form-control-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fa fa-exclamation fa-lg form-control-feedback\"></i>');
$(element).closest('.form-group').append('<i class=\"fa fa-exclamation fa-lg form-control-feedback\"></i>');
},
unhighlight: function(element, errorClass, validClass) {
$(element).closest('.form-group').removeClass('has-error').addClass('has-success').addClass('has-feedback');
$(element).closest('.form-group').find('i.fa.form-control-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fa fa-check fa-lg form-control-feedback\"></i>');
$(element).closest('.form-group').append('<i class=\"fa fa-check fa-lg form-control-feedback\"></i>');
},
errorElement: 'span',
errorClass: 'help-block',
Expand Down Expand Up @@ -472,17 +472,17 @@ function toHTML($form_id = null) {
$(element).closest('form').addClass('was-validated');
// move backward to label and set to invalid
$(element).parent().find('label').removeClass('valid-feedback').addClass('invalid-feedback');
$(element).closest('.form-group').find('i.fa.valid-feedback').remove();
$(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fas fa-exclamation fa-lg invalid-feedback\"></i>');
},
unhighlight: function(element, errorClass, validClass) {
// mark form as validated
$(element).closest('form').addClass('was-validated');
// move backward to label and set to valid
$(element).parent().find('label').removeClass('invalid-feedback').addClass('valid-feedback');
$(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
$(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fas fa-check fa-lg valid-feedback\"></i>');
},
errorElement: 'small',
Expand Down Expand Up @@ -517,12 +517,12 @@ function toHTML($form_id = null) {
highlight: function(element, errorClass, validClass) {
$(element).closest('.form-group').removeClass('has-success').addClass('has-error').addClass('has-feedback');
$(element).closest('.form-group').find('i.fa.form-control-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fa fa-exclamation fa-lg form-control-feedback\"></i>');
$(element).closest('.form-group').append('<i class=\"fa fa-exclamation fa-lg form-control-feedback\"></i>');
},
unhighlight: function(element, errorClass, validClass) {
$(element).closest('.form-group').removeClass('has-error').addClass('has-success').addClass('has-feedback');
$(element).closest('.form-group').find('i.fa.form-control-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fa fa-check fa-lg form-control-feedback\"></i>');
$(element).closest('.form-group').append('<i class=\"fa fa-check fa-lg form-control-feedback\"></i>');
},
errorElement: 'span',
errorClass: 'help-block',
Expand Down
24 changes: 12 additions & 12 deletions framework/plugins/block.form.php
View file
Expand Up @@ -139,17 +139,17 @@ function smarty_block_form($params,$content,&$smarty, &$repeat) {
$(element).closest('form').addClass('was-validated');
// move backward to label and set to invalid
$(element).parent().find('label').removeClass('valid-feedback').addClass('invalid-feedback');
$(element).closest('.form-group').find('i.fa.valid-feedback').remove();
$(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fas fa-exclamation fa-lg invalid-feedback\"></i>');
},
unhighlight: function(element, errorClass, validClass) {
// mark form as validated
$(element).closest('form').addClass('was-validated');
// move backward to label and set to valid
$(element).parent().find('label').removeClass('invalid-feedback').addClass('valid-feedback');
$(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
$(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fas fa-check fa-lg valid-feedback\"></i>');
},
errorElement: 'small',
Expand Down Expand Up @@ -183,12 +183,12 @@ function smarty_block_form($params,$content,&$smarty, &$repeat) {
highlight: function(element, errorClass, validClass) {
$(element).closest('.form-group').removeClass('has-success').addClass('has-error').addClass('has-feedback');
$(element).closest('.form-group').find('i.fa.form-control-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fa fa-exclamation fa-lg form-control-feedback\"></i>');
$(element).closest('.form-group').append('<i class=\"fa fa-exclamation fa-lg form-control-feedback\"></i>');
},
unhighlight: function(element, errorClass, validClass) {
$(element).closest('.form-group').removeClass('has-error').addClass('has-success').addClass('has-feedback');
$(element).closest('.form-group').find('i.fa.form-control-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fa fa-check fa-lg form-control-feedback\"></i>');
$(element).closest('.form-group').append('<i class=\"fa fa-check fa-lg form-control-feedback\"></i>');
},
errorElement: 'span',
errorClass: 'help-block',
Expand Down Expand Up @@ -235,17 +235,17 @@ function smarty_block_form($params,$content,&$smarty, &$repeat) {
$(element).closest('form').addClass('was-validated');
// move backward to label and set to invalid
$(element).parent().find('label').removeClass('valid-feedback').addClass('invalid-feedback');
$(element).closest('.form-group').find('i.fa.valid-feedback').remove();
$(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fas fa-exclamation fa-lg invalid-feedback\"></i>');
},
unhighlight: function(element, errorClass, validClass) {
// mark form as validated
$(element).closest('form').addClass('was-validated');
// move backward to label and set to valid
$(element).parent().find('label').removeClass('invalid-feedback').addClass('valid-feedback');
$(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
$(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.invalid-feedback').remove();
// $(element).closest('.form-group').find('i.fa.valid-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fas fa-check fa-lg valid-feedback\"></i>');
},
errorElement: 'small',
Expand Down Expand Up @@ -280,12 +280,12 @@ function smarty_block_form($params,$content,&$smarty, &$repeat) {
highlight: function(element, errorClass, validClass) {
$(element).closest('.form-group').removeClass('has-success').addClass('has-error').addClass('has-feedback');
$(element).closest('.form-group').find('i.fa.form-control-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fa fa-exclamation fa-lg form-control-feedback\"></i>');
$(element).closest('.form-group').append('<i class=\"fa fa-exclamation fa-lg form-control-feedback\"></i>');
},
unhighlight: function(element, errorClass, validClass) {
$(element).closest('.form-group').removeClass('has-error').addClass('has-success').addClass('has-feedback');
$(element).closest('.form-group').find('i.fa.form-control-feedback').remove();
// $(element).closest('.form-group').append('<i class=\"fa fa-check fa-lg form-control-feedback\"></i>');
$(element).closest('.form-group').append('<i class=\"fa fa-check fa-lg form-control-feedback\"></i>');
},
errorElement: 'span',
errorClass: 'help-block',
Expand Down

0 comments on commit e8f8fd8

Please sign in to comment.