Skip to content

Fixed error message in Bootstrap 3 horizontal form display problem and modified Gruntfile.js to live reload project #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2017
Merged

Fixed error message in Bootstrap 3 horizontal form display problem and modified Gruntfile.js to live reload project #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314f051
Modified Gruntfile.js to live reload project
aswindasfog Aug 13, 2017
cd2dee5
Fixed error message in Bootstrap 3 horizontal form display problem
aswindasfog Aug 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ function initializeGruntConfig(grunt) {
watch: {
files: [SRC_DIR + '/**'],
tasks: ['test'],
options: { nospawn: true}
options: {
nospawn: true,
livereload: true
}
},

// Unit tests
Expand All @@ -111,8 +114,7 @@ function initializeGruntConfig(grunt) {
server: {
options: {
port: 8000,
base: '.',
keepalive: true
base: '.'
}
}
},
Expand Down Expand Up @@ -201,6 +203,6 @@ module.exports = function (grunt) {
grunt.registerTask("build-production", ["version", "test", "uglify"]);
grunt.registerTask('build', ['concat', 'copy', 'umd', 'cssmin']);
grunt.registerTask('test', ['build','jshint', 'qunit']);
grunt.registerTask("default", ["test", "watch"]);
grunt.registerTask("default", ["test", "connect", "watch"]);
grunt.registerTask("prepublish", ["test", "uglify"]);
};
12 changes: 7 additions & 5 deletions src/main/dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@
return $($elem.valAttr('error-msg-container'));
} else {
var $parent = $elem.parent();
if (!$parent.hasClass('form-group') && !$parent.closest('form').hasClass('form-horizontal')) {
var $formGroup = $parent.closest('.form-group');
if ($formGroup.length) {
return $formGroup.eq(0);
}
if($elem.attr('type') === 'checkbox' && $elem.closest('.checkbox').length) {
$parent = $elem.closest('.checkbox').parent();
} else if($elem.attr('type') === 'radio' && $elem.closest('.radio').length) {
$parent = $elem.closest('.radio').parent();
}
if($parent.closest('.input-group').length) {
$parent = $parent.closest('.input-group').parent();
}
return $parent;
}
Expand Down
224 changes: 224 additions & 0 deletions test/bootstrap3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Bootstrap 3 Compatibility Test</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
</head>
<body>
<div class="container">
<h2>Not Bootstrap form</h2>
<form>
<p>Text
<input type="text" data-validation="required">
</p>
<p>Check
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 1
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 2
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 3
</p>
<p>Select
<input type="radio" name="exampleRadio" data-validation="required"> Radio 1
<input type="radio" name="exampleRadio" data-validation="required"> Radio 2
<input type="radio" name="exampleRadio" data-validation="required"> Radio 3
</p>
<input type="submit" class="button">
</form>
<hr>
<h2>Basic form</h2>
<form>
<div class="form-group">
<label class="control-label">Text</label>
<input type="text" class="form-control" data-validation="required">
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></div>
<input type="text" class="form-control" data-validation="required">
</div>
</div>
<div class="form-group">
<label class="control-label">Check</label>
<div class="checkbox">
<label>
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 1
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 2
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 3
</label>
</div>
</div>
<div class="form-group">
<label class="control-label">Select</label>
<div class="radio">
<label>
<input type="radio" name="exampleRadio" data-validation="required"> Radio 1
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="exampleRadio" data-validation="required"> Radio 2
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="exampleRadio" data-validation="required"> Radio 3
</label>
</div>
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
<hr>
<h2>Inline form</h2>
<form class="form-inline">
<div class="form-group">
<label class="control-label">Text</label>
<input type="text" class="form-control" data-validation="required">
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></div>
<input type="text" class="form-control" data-validation="required">
</div>
</div>
<div class="form-group">
<label class="control-label">Check</label>
<div class="checkbox">
<label class="checkbox-inline">
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 1
</label>
</div>
<div class="checkbox">
<label class="checkbox-inline">
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 2
</label>
</div>
<div class="checkbox">
<label class="checkbox-inline">
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 3
</label>
</div>
</div>
<div class="form-group">
<label class="control-label">Select</label>
<div class="radio">
<label class="radio-inline">
<input type="radio" name="exampleRadio" data-validation="required"> Radio 1
</label>
</div>
<div class="radio">
<label class="radio-inline">
<input type="radio" name="exampleRadio" data-validation="required"> Radio 2
</label>
</div>
<div class="radio">
<label class="radio-inline">
<input type="radio" name="exampleRadio" data-validation="required"> Radio 3
</label>
</div>
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
<hr>
<h2>Horizontal form</h2>
<form class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2" >Text</label>
<div class="col-sm-10">
<input type="text" class="form-control" data-validation="required">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Text</label>
<div class="col-sm-5">
<input type="text" class="form-control" data-validation="required">
</div>
<div class="col-sm-5">
<input type="text" class="form-control" data-validation="required">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Text</label>
<div class="col-sm-10">
<div class="input-group">
<div class="input-group-addon"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></div>
<input type="text" class="form-control" data-validation="required">
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Text</label>
<div class="col-sm-5">
<div class="input-group">
<div class="input-group-addon"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></div>
<input type="text" class="form-control" data-validation="required">
</div>
</div>
<div class="col-sm-5">
<div class="input-group">
<div class="input-group-addon"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></div>
<input type="text" class="form-control" data-validation="required">
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Check</label>
<div class="col-sm-10">
<div class="checkbox">
<label>
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 1
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 2
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="exampleCheckBox" data-validation="required"> CheckBox 3
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">Select</label>
<div class="col-sm-10">
<div class="radio">
<label>
<input type="radio" name="exampleRadio" data-validation="required"> Radio 1
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="exampleRadio" data-validation="required"> Radio 2
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="exampleRadio" data-validation="required"> Radio 3
</label>
</div>
</div>
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
<hr>
</div>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
<script src="../form-validator/jquery.form-validator.js"></script>
<script>
$(function() {
// setup validate
$.validate();
});
</script>
</body>
</html>