Skip to content
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

Jump to bottom

update Control-group to form-group bootstrap 3 #169

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

update Control-group to form-group bootstrap 3 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f488903
update Control-group to form-group bootstrap 3
mmbfreitas Aug 15, 2014
5b4516b
update Control-group to form-group bootstrap 3
mmbfreitas Aug 15, 2014
95135a5
update Control-group to form-group bootstrap 3
mmbfreitas Aug 15, 2014
75a590d
update Control-group to form-group bootstrap 3
mmbfreitas Aug 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js:
- "0.9"
- "0.10"
before_script:
- npm install -g grunt-cli
2,250 changes: 1,131 additions & 1,119 deletions dist/jqBootstrapValidation-1.3.7.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/jqBootstrapValidation-1.3.7.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified dist/jqBootstrapValidation.zip
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions src/jqBootstrapValidation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
var warningsFound = 0;
// Get all inputs
var $allInputs = $form.find("input,textarea,select").not("[type=submit],[type=image]").filter(settings.options.filter);
var $allControlGroups = $form.find(".control-group");
var $allControlGroups = $form.find(".form-group");

// Only trigger validation on the ones that actually _have_ validation
var $inputsWithValidators = $allInputs.filter(function () {
Expand Down Expand Up @@ -86,7 +86,7 @@

// Get references to everything we're interested in
var $this = $(this),
$controlGroup = $this.parents(".control-group").first(),
$controlGroup = $this.parents(".form-group").first(),
$helpBlock = $controlGroup.find(".help-block").first(),
$form = $this.parents("form").first(),
validatorNames = [];
Expand Down Expand Up @@ -597,7 +597,7 @@

var
$this = $(this),
$controlGroup = $this.parents(".control-group").first(),
$controlGroup = $this.parents(".form-group").first(),
$helpBlock = $controlGroup.find(".help-block").first(),
$form = $this.parents("form").first();

Expand Down Expand Up @@ -861,7 +861,7 @@
var $label = null;
if (($label = $form.find("label[for=\"" + elementName + "\"]")).length) {
message += " '" + $label.text() + "'";
} else if (($label = $element.parents(".control-group").first().find("label")).length) {
} else if (($label = $element.parents(".form-group").first().find("label")).length) {
message += " '" + $label.first().text() + "'";
}

Expand Down Expand Up @@ -1143,7 +1143,7 @@
var type = $this.attr("type");
if (type === "checkbox") {
value = ($this.is(":checked") ? value : "");
var checkboxParent = $this.parents("form").first() || $this.parents(".control-group").first();
var checkboxParent = $this.parents("form").first() || $this.parents(".form-group").first();
if (checkboxParent) {
value = checkboxParent.find("input[name='" + $this.attr("name") + "']:checked").map(function (i, el) {
return $(el).val();
Expand All @@ -1152,7 +1152,7 @@
}
else if (type === "radio") {
value = ($('input[name="' + $this.attr("name") + '"]:checked').length > 0 ? $this.val() : "");
var radioParent = $this.parents("form").first() || $this.parents(".control-group").first();
var radioParent = $this.parents("form").first() || $this.parents(".form-group").first();
if (radioParent) {
value = radioParent.find("input[name='" + $this.attr("name") + "']:checked").map(function (i, el) {
return $(el).val();
Expand Down
4 changes: 2 additions & 2 deletions test/issues/39/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
setup: function() {
$("#qunit-fixture").append("\
<form class='form-horizontal' novalidate>\
<div class='control-group'>\
<div class='form-group'>\
<label class='control-label'>Email address</label>\
<div class='controls'>\
<input\
Expand Down Expand Up @@ -58,7 +58,7 @@
setup: function() {
$("#qunit-fixture").append("\
<form class='form-horizontal' novalidate>\
<div class='control-group'>\
<div class='form-group'>\
<label class='control-label'>Email address</label>\
<div class='controls'>\
<input\
Expand Down
4 changes: 2 additions & 2 deletions test/issues/50/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
setup: function() {
$("#qunit-fixture").append("\
<form class='form-horizontal' novalidate>\
<div class='control-group'>\
<div class='form-group'>\
<label class='control-label'>Email address</label>\
<div class='controls'>\
<input\
Expand Down Expand Up @@ -58,7 +58,7 @@
setup: function() {
$("#qunit-fixture").append("\
<form class='form-horizontal' novalidate>\
<div class='control-group'>\
<div class='form-group'>\
<label class='control-label'>Email address</label>\
<div class='controls'>\
<input\
Expand Down
14 changes: 7 additions & 7 deletions test/jqBootstrapValidation_helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
window.runJQBVTest = function(value, classChange, classSubmit, messageChange, messageSubmit) {

var $input = $("#qunit-fixture").find("[name=input]");
var $controlGroup = $($input.parents(".control-group")[0]);
var $controlGroup = $($input.parents(".form-group")[0]);
var $form = $input.parents("form").first();
var isMulti = ($input.length > 1);

Expand Down Expand Up @@ -143,7 +143,7 @@
}

$input.trigger("change.validation");
var changeClassExpected = ["control-group"].concat(classChange);
var changeClassExpected = ["form-group"].concat(classChange);
var changeClassActual = $controlGroup.attr("class").split(" ");
deepEqual(changeClassActual, changeClassExpected, "classes as expected on change - " + valueJson);

Expand All @@ -156,7 +156,7 @@
var nowErrors = window.number_of_submit_errors;
var nowSuccess = window.number_of_submit_successes;

var submitClassExpected = ["control-group"].concat(classSubmit);
var submitClassExpected = ["form-group"].concat(classSubmit);
var submitClassActual = $controlGroup.attr("class").split(" ");
deepEqual(submitClassActual, submitClassExpected, "classes as expected on submit - " + valueJson);

Expand All @@ -183,7 +183,7 @@
window.runJQBVTestAsync = function(value, classChange, classSubmit, messageChange, messageSubmit, callback) {

var $input = $("#qunit-fixture").find("[name=input]");
var $controlGroup = $($input.parents(".control-group")[0]);
var $controlGroup = $($input.parents(".form-group")[0]);
var $form = $input.parents("form").first();
var isMulti = ($input.length > 1);

Expand Down Expand Up @@ -235,7 +235,7 @@
$input.trigger("change.validation");
setTimeout(
function() {
var changeClassExpected = ["control-group"].concat(classChange);
var changeClassExpected = ["form-group"].concat(classChange);
var changeClassActual = $controlGroup.attr("class").split(" ");
deepEqual(changeClassActual, changeClassExpected, "classes as expected on change - " + valueJson);

Expand All @@ -251,7 +251,7 @@
var nowErrors = window.number_of_submit_errors;
var nowSuccess = window.number_of_submit_successes;

var submitClassExpected = ["control-group"].concat(classSubmit);
var submitClassExpected = ["form-group"].concat(classSubmit);
var submitClassActual = $controlGroup.attr("class").split(" ");
deepEqual(submitClassActual, submitClassExpected, "classes as expected on submit - " + valueJson);

Expand All @@ -273,7 +273,7 @@
$form.trigger("submit");
setTimeout(
function() {
var submitClassExpected = ["control-group"].concat(classSubmit);
var submitClassExpected = ["form-group"].concat(classSubmit);
var submitClassActual = $controlGroup.attr("class").split(" ");

deepEqual(submitClassActual, submitClassExpected, "classes as expected on submit - " + valueJson);
Expand Down