Merge branch '3.8'

This commit is contained in:
Romain Neutron
2013-11-13 17:07:45 +01:00
6 changed files with 151 additions and 35 deletions

View File

@@ -31,7 +31,8 @@ require([
}, function () {
Common.initialize();
var rules = [
var rules = [];
var defaultRules = [
{
name: "email",
rules: "required",
@@ -85,7 +86,13 @@ require([
"message": i18n.t("validation_blank")
};
rules.push(rule);
defaultRules.push(rule);
}
});
_.each(defaultRules, function (rule) {
// add rule if element exists
if ($("[name='" + rule.name + "']").length >= 1) {
}
});

View File

@@ -30,7 +30,8 @@ require([
resGetPath: Common.languagePath,
useLocalStorage: true
}, function () {
var rules = [
var rules = [];
var defaultRules = [
{
name: "email",
rules: "required",
@@ -84,6 +85,13 @@ require([
"message": i18n.t("validation_blank")
};
defaultRules.push(rule);
}
});
_.each(defaultRules, function (rule) {
// add rule if element exists
if ($("[name='" + rule.name + "']").length >= 1) {
rules.push(rule);
}
});