Code refactor and cleanup.

This commit is contained in:
2023-10-04 00:09:17 +01:00
parent f50c03aad9
commit 6001258ba6
37 changed files with 7467 additions and 8244 deletions

View File

@@ -32,5 +32,5 @@ Aaru configure
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -29,6 +29,6 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -33,5 +33,5 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -31,17 +31,17 @@ Windows: `Aaru device info D:`
## Operating system support
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------|----------|--------|--------|----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No¹ | Yes | Yes |
| Serial ATA | Yes | No¹ | Yes | Yes |
| USB | Partial⁴ | Partial⁵ | Yes | Yes |
| FireWire | Partial⁶ | Partial⁵ | Yes | Partial⁶ |
| PCMCIA | Partial⁷ | Partial⁵ | Yes | Partial⁷ |
| SecureDigital / MultiMediaCard | Not yet⁸ | No¹ | Yes | Untested⁹ |
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------------------------|----------|----------|-------|-----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No¹ | Yes | Yes |
| Serial ATA | Yes | No¹ | Yes | Yes |
| USB | Partial⁴ | Partial⁵ | Yes | Yes |
| FireWire | Partial⁶ | Partial⁵ | Yes | Partial⁶ |
| PCMCIA | Partial⁷ | Partial⁵ | Yes | Partial⁷ |
| SecureDigital / MultiMediaCard | Not yet⁸ | No¹ | Yes | Untested⁹ |
1. macOS only allows talking with MultiMedia devices.
2. Support for MultiMedia devices in macOS will be added if users require it

View File

@@ -30,5 +30,5 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

Binary file not shown.

View File

@@ -138,7 +138,8 @@ don't need to create one. When you are creating a bug report, please
[include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out the required template, the
information it asks for helps us resolve issues faster.
> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new
> issue and include a link to the original issue in the body of your new one.
#### Before Submitting A Bug Report

View File

@@ -5,25 +5,25 @@ responsibilities.
## Maintainers
| Maintainer | GitHub ID | Affiliation |
| --------------- | --------- | ----------- |
| Natalia Portillo | [claunia](https://github.com/claunia) | [Aaru](https://aaru.app) |
| Michael Drüing | [darkstar](https://github.com/darkstar) | [Aaru](https://aaru.app) |
| Rebecca Wallander | [FakeShemp](https://github.com/FakeShemp) | [Aaru](https://aaru.app) |
| Matt Nadareski | [mnadareski](https://github.com/mnadareski) | [Aaru](https://aaru.app) |
| Maintainer | GitHub ID | Affiliation |
|-------------------|---------------------------------------------|--------------------------|
| Natalia Portillo | [claunia](https://github.com/claunia) | [Aaru](https://aaru.app) |
| Michael Drüing | [darkstar](https://github.com/darkstar) | [Aaru](https://aaru.app) |
| Rebecca Wallander | [FakeShemp](https://github.com/FakeShemp) | [Aaru](https://aaru.app) |
| Matt Nadareski | [mnadareski](https://github.com/mnadareski) | [Aaru](https://aaru.app) |
## Technical committee
| TC Member | GitHub ID | Affiliation |
| --------------- | --------- | ----------- |
| Robin François| [robin-francois](https://github.com/robin-francois) | Cinémathèque suisse |
| Joseph Redon | X | Game Preservation Society |
| Jonas Rosland | [jonasrosland](https://github.com/jonasrosland) | Hit Save! |
| TC Member | GitHub ID | Affiliation |
|----------------|-----------------------------------------------------|---------------------------|
| Robin François | [robin-francois](https://github.com/robin-francois) | Cinémathèque suisse |
| Joseph Redon | X | Game Preservation Society |
| Jonas Rosland | [jonasrosland](https://github.com/jonasrosland) | Hit Save! |
## Aaru Contributors & Stakeholders
| Feature | Contributor | GitHub ID | Affiliation |
| --------------- | --------- | ----------- | --- |
| Development | Michael Drüing | [darkstar](https://github.com/darkstar) | [Aaru](https://aaru.app) |
| Development | Rebecca Wallander | [FakeShemp](https://github.com/FakeShemp) | [Aaru](https://aaru.app) |
| QA | Silas Laspada | [SilasLaspada](https://github.com/SilasLaspada) | [Aaru](https://aaru.app) |
| Feature | Contributor | GitHub ID | Affiliation |
|-------------|-------------------|-------------------------------------------------|--------------------------|
| Development | Michael Drüing | [darkstar](https://github.com/darkstar) | [Aaru](https://aaru.app) |
| Development | Rebecca Wallander | [FakeShemp](https://github.com/FakeShemp) | [Aaru](https://aaru.app) |
| QA | Silas Laspada | [SilasLaspada](https://github.com/SilasLaspada) | [Aaru](https://aaru.app) |

View File

@@ -2,30 +2,30 @@ In this page you can find a comparison between Aaru and other dump image manager
## Comparison of optical discs image managers
| | Aaru | DiscImageCreator | CDRWin | CloneCD | Alcohol 120% | IsoBuster | WinImage |
|-------------------------------------------------|--------------------------|------------------|----------|----------|--------------|-----------|-----------|
| Opensource | Yes | [Yes](https://github.com/saramibreak/DiscImageCreator) | No | No | No | No | No |
| Supported platforms | Windows, Linux, macOS¹ | Windows | Windows | Windows | Windows | Windows | Windows |
| Supported formats | [12](formats.md) | 3² | 1³ | 1⁴ | 1⁵ | 17⁶ | 1⁷ |
| Can dump Audio CD | Yes⁸ | Yes | Yes | Yes | Yes | Yes | No |
| Can dump Mode 0 tracks | Yes | No | No | No | No | No | No |
| Can dump Mode 1 tracks | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
| Can dump Mode 2 tracks | Yes⁸ | Yes | Yes | Yes | Yes | Yes | Yes |
| Can dump multisession discs | Yes | Yes | No | Yes | Yes | Yes | No |
| Can dump discs with errors | Yes⁹ | Yes¹⁰ | No¹¹ | Yes¹⁰ | Yes¹⁰ | Unknown | Unknown |
| Reads subchannel | Yes | Yes | No¹² | Yes | Yes | Unknown | No |
| Reads lead-in postgap | Yes | Yes | No | No | No | No | No |
| Supports illegal TOCs | Yes | Yes | No | Yes | Yes | Yes | No |
| Supports error-based copy protections | Yes | Yes | No | Yes | Yes | Yes | No |
| Supports twin sectors based copy protections | Not yet¹³ | No | No | No | No | No | No |
| Supports position based copy protections | Not yet¹³ | No | No | No | Yes | No | No |
| Supports dumping DDCD | Yes | No¹⁴ | No¹⁴ | No¹⁴ | No¹⁴ | No¹⁴ | No¹⁴ |
| Supports dumping GD | Not yet¹⁵ | Yes | No | No | No | No | No |
| Supports dumping GameCube/Wii | Not yet¹⁵ | Yes | No | No | No | No | No |
| Supports dumping DVD¹⁶ ¹⁷ | Yes | Partial¹⁸ | No | No | Partial¹⁸ | Partial¹⁸ | Partial¹⁸ |
| Supports dumping HD DVD¹⁶ | Yes | Partial¹⁹ | No | No | Partial¹⁹ | Partial¹⁹ | Partial¹⁹ |
| Supports dumping Blu- ray¹⁶ ²⁰ | Yes | Yes | No | No | Yes | Yes | Yes |
| Supports dumping Xbox Game discs | Yes²¹ ²² | Yes²² | No | No | No | No | No |
| | Aaru | DiscImageCreator | CDRWin | CloneCD | Alcohol 120% | IsoBuster | WinImage |
|-------------------------------------------------|------------------------|--------------------------------------------------------|---------|---------|--------------|-----------|-----------|
| Opensource | Yes | [Yes](https://github.com/saramibreak/DiscImageCreator) | No | No | No | No | No |
| Supported platforms | Windows, Linux, macOS¹ | Windows | Windows | Windows | Windows | Windows | Windows |
| Supported formats | [12](formats.md) | 3² | 1³ | 1⁴ | 1⁵ | 17⁶ | 1⁷ |
| Can dump Audio CD | Yes⁸ | Yes | Yes | Yes | Yes | Yes | No |
| Can dump Mode 0 tracks | Yes | No | No | No | No | No | No |
| Can dump Mode 1 tracks | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
| Can dump Mode 2 tracks | Yes⁸ | Yes | Yes | Yes | Yes | Yes | Yes |
| Can dump multisession discs | Yes | Yes | No | Yes | Yes | Yes | No |
| Can dump discs with errors | Yes⁹ | Yes¹⁰ | No¹¹ | Yes¹⁰ | Yes¹⁰ | Unknown | Unknown |
| Reads subchannel | Yes | Yes | No¹² | Yes | Yes | Unknown | No |
| Reads lead-in postgap | Yes | Yes | No | No | No | No | No |
| Supports illegal TOCs | Yes | Yes | No | Yes | Yes | Yes | No |
| Supports error-based copy protections | Yes | Yes | No | Yes | Yes | Yes | No |
| Supports twin sectors based copy protections | Not yet¹³ | No | No | No | No | No | No |
| Supports position based copy protections | Not yet¹³ | No | No | No | Yes | No | No |
| Supports dumping DDCD | Yes | No¹⁴ | No¹⁴ | No¹⁴ | No¹⁴ | No¹⁴ | No¹⁴ |
| Supports dumping GD | Not yet¹⁵ | Yes | No | No | No | No | No |
| Supports dumping GameCube/Wii | Not yet¹⁵ | Yes | No | No | No | No | No |
| Supports dumping DVD¹⁶ ¹⁷ | Yes | Partial¹⁸ | No | No | Partial¹⁸ | Partial¹⁸ | Partial¹⁸ |
| Supports dumping HD DVD¹⁶ | Yes | Partial¹⁹ | No | No | Partial¹⁹ | Partial¹⁹ | Partial¹⁹ |
| Supports dumping Blu- ray¹⁶ ²⁰ | Yes | Yes | No | No | Yes | Yes | Yes |
| Supports dumping Xbox Game discs | Yes²¹ ²² | Yes²² | No | No | No | No | No |
1. macOS does not yet support dumping media, only managing existing images
2. CDRWin, CloneCD and raw

View File

@@ -2,17 +2,17 @@ The following physical devices are supported:
## Operating system support
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------|----------|--------|--------|----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No¹ | Yes | Yes |
| Serial ATA | Yes | No¹ | Yes | Yes |
| USB | Partial⁴ | Not yet⁵ | Yes | Yes |
| FireWire | Partial⁶ | Not yet⁵ | Yes | Partial⁶ |
| PCMCIA | Partial⁷ | Not yet⁵ | Yes | Partial⁷ |
| SecureDigital / MultiMediaCard | Not yet⁸ | No¹ | Yes | Untested⁹ |
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------------------------|----------|----------|-------|-----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No¹ | Yes | Yes |
| Serial ATA | Yes | No¹ | Yes | Yes |
| USB | Partial⁴ | Not yet⁵ | Yes | Yes |
| FireWire | Partial⁶ | Not yet⁵ | Yes | Partial⁶ |
| PCMCIA | Partial⁷ | Not yet⁵ | Yes | Partial⁷ |
| SecureDigital / MultiMediaCard | Not yet⁸ | No¹ | Yes | Untested⁹ |
1. macOS only allows talking with MultiMedia devices.
2. Support for MultiMedia devices in macOS will be added if users require it

View File

@@ -36,6 +36,6 @@ Aaru filesystem extract -x -e iso8859-15 mydisc.cue contents
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -28,5 +28,5 @@ Aaru image analyze mydisc.cue
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -30,5 +30,5 @@ filesystem)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -20,5 +20,5 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -21,5 +21,5 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -44,5 +44,5 @@ Aaru image checksum -f false --sha512 true mydisc.cue
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -29,5 +29,5 @@ Aaru image compare mydisc.cue anotherdisc.mds
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -64,5 +64,5 @@ Aaru image convert -c 32 --comments "My converted image" --creator "Jane Doe" --
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -39,6 +39,6 @@ Aaru image create-sidecar -e shift_jis "My japanese software.img"
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -34,5 +34,5 @@ Aaru image decode -s 1000 -l 15 -p false mydisc.cue
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -35,5 +35,5 @@ Aaru image entropy mydisc.cue
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -29,6 +29,6 @@ Aaru image info mydisc.cue
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -27,5 +27,5 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -36,5 +36,5 @@ Aaru image print -s 15 -l 30 -r -w 64 mydisc.cue
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -33,5 +33,5 @@ Aaru image verify mydisc.cue
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Aaru Data Preservation Suite</title>
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"/>
<meta content="Description" name="description">
<meta content="width=device-width, initial-scale=1.0, minimum-scale=1.0" name="viewport">
<!-- Theme: Simple Dark -->

View File

@@ -6,63 +6,50 @@
/*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
/*global document: false, jQuery: false */
(function(factory)
{
if(typeof define === 'function' && define.amd)
{
(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define("jquery.validate.unobtrusive", ['jquery-validation'], factory);
} else if(typeof module === 'object' && module.exports)
{
} else if (typeof module === 'object' && module.exports) {
// CommonJS-like environments that support module.exports
module.exports = factory(require('jquery-validation'));
} else
{
} else {
// Browser global
jQuery.validator.unobtrusive = factory(jQuery);
}
}(function($)
{
}(function ($) {
var $jQval = $.validator,
adapters,
data_validation = "unobtrusiveValidation";
function setValidationValues(options, ruleName, value)
{
function setValidationValues(options, ruleName, value) {
options.rules[ruleName] = value;
if(options.message)
{
if (options.message) {
options.messages[ruleName] = options.message;
}
}
function splitAndTrim(value)
{
function splitAndTrim(value) {
return value.replace(/^\s+|\s+$/g, "").split(/\s*,\s*/g);
}
function escapeAttributeValue(value)
{
function escapeAttributeValue(value) {
// As mentioned on http://api.jquery.com/category/selectors/
return value.replace(/([!"#$%&'()*+,./:;<=>?@\[\\\]^`{|}~])/g, "\\$1");
}
function getModelPrefix(fieldName)
{
function getModelPrefix(fieldName) {
return fieldName.substr(0, fieldName.lastIndexOf(".") + 1);
}
function appendModelPrefix(value, prefix)
{
if(value.indexOf("*.") === 0)
{
function appendModelPrefix(value, prefix) {
if (value.indexOf("*.") === 0) {
value = value.replace("*.", prefix);
}
return value;
}
function onError(error, inputElement)
{ // 'this' is the form element
function onError(error, inputElement) { // 'this' is the form element
var container = $(this).find("[data-valmsg-for='" + escapeAttributeValue(inputElement[0].name) + "']"),
replaceAttrValue = container.attr("data-valmsg-replace"),
replace = replaceAttrValue ? $.parseJSON(replaceAttrValue) !== false : null;
@@ -70,67 +57,55 @@
container.removeClass("field-validation-valid").addClass("field-validation-error");
error.data("unobtrusiveContainer", container);
if(replace)
{
if (replace) {
container.empty();
error.removeClass("input-validation-error").appendTo(container);
} else
{
} else {
error.hide();
}
}
function onErrors(event, validator)
{ // 'this' is the form element
function onErrors(event, validator) { // 'this' is the form element
var container = $(this).find("[data-valmsg-summary=true]"),
list = container.find("ul");
if(list && list.length && validator.errorList.length)
{
if (list && list.length && validator.errorList.length) {
list.empty();
container.addClass("validation-summary-errors").removeClass("validation-summary-valid");
$.each(validator.errorList, function()
{
$.each(validator.errorList, function () {
$("<li />").html(this.message).appendTo(list);
});
}
}
function onSuccess(error)
{ // 'this' is the form element
function onSuccess(error) { // 'this' is the form element
var container = error.data("unobtrusiveContainer");
if(container)
{
if (container) {
var replaceAttrValue = container.attr("data-valmsg-replace"),
replace = replaceAttrValue ? $.parseJSON(replaceAttrValue) : null;
container.addClass("field-validation-valid").removeClass("field-validation-error");
error.removeData("unobtrusiveContainer");
if(replace)
{
if (replace) {
container.empty();
}
}
}
function onReset(event)
{ // 'this' is the form element
function onReset(event) { // 'this' is the form element
var $form = $(this),
key = '__jquery_unobtrusive_validation_form_reset';
if($form.data(key))
{
if ($form.data(key)) {
return;
}
// Set a flag that indicates we're currently resetting the form.
$form.data(key, true);
try
{
try {
$form.data("validator").resetForm();
} finally
{
} finally {
$form.removeData(key);
}
@@ -145,51 +120,43 @@
.removeData("unobtrusiveContainer");
}
function validationInfo(form)
{
function validationInfo(form) {
var $form = $(form),
result = $form.data(data_validation),
onResetProxy = $.proxy(onReset, form),
defaultOptions = $jQval.unobtrusive.options || {},
execInContext = function(name, args)
{
execInContext = function (name, args) {
var func = defaultOptions[name];
func && $.isFunction(func) && func.apply(form, args);
};
if(!result)
{
if (!result) {
result = {
options: { // options structure passed to jQuery Validate's validate() method
errorClass: defaultOptions.errorClass || "input-validation-error",
errorElement: defaultOptions.errorElement || "span",
errorPlacement: function()
{
errorPlacement: function () {
onError.apply(form, arguments);
execInContext("errorPlacement", arguments);
},
invalidHandler: function()
{
invalidHandler: function () {
onErrors.apply(form, arguments);
execInContext("invalidHandler", arguments);
},
messages: {},
rules: {},
success: function()
{
success: function () {
onSuccess.apply(form, arguments);
execInContext("success", arguments);
}
},
attachValidation: function()
{
attachValidation: function () {
$form
.off("reset." + data_validation, onResetProxy)
.on("reset." + data_validation, onResetProxy)
.validate(this.options);
},
validate: function()
{ // a validation function that is called by unobtrusive Ajax
validate: function () { // a validation function that is called by unobtrusive Ajax
$form.validate();
return $form.valid();
}
@@ -203,8 +170,7 @@
$jQval.unobtrusive = {
adapters: [],
parseElement: function(element, skipAttach)
{
parseElement: function (element, skipAttach) {
/// <summary>
/// Parses a single HTML element for unobtrusive validation attributes.
/// </summary>
@@ -217,8 +183,7 @@
form = $element.parents("form")[0],
valInfo, rules, messages;
if(!form)
{ // Cannot do client-side validation without a form
if (!form) { // Cannot do client-side validation without a form
return;
}
@@ -226,18 +191,15 @@
valInfo.options.rules[element.name] = rules = {};
valInfo.options.messages[element.name] = messages = {};
$.each(this.adapters, function()
{
$.each(this.adapters, function () {
var prefix = "data-val-" + this.name,
message = $element.attr(prefix),
paramValues = {};
if(message !== undefined)
{ // Compare against undefined, because an empty message is legal (and falsy)
if (message !== undefined) { // Compare against undefined, because an empty message is legal (and falsy)
prefix += "-";
$.each(this.params, function()
{
$.each(this.params, function () {
paramValues[this] = $element.attr(prefix + this);
});
@@ -254,14 +216,12 @@
$.extend(rules, {"__dummy__": true});
if(!skipAttach)
{
if (!skipAttach) {
valInfo.attachValidation();
}
},
parse: function(selector)
{
parse: function (selector) {
/// <summary>
/// Parses all the HTML elements in the specified selector. It looks for input elements decorated
/// with the [data-val=true] attribute value and enables validation according to the data-val-*
@@ -278,16 +238,13 @@
.add($selector.find("form"))
.has("[data-val=true]");
$selector.find("[data-val=true]").each(function()
{
$selector.find("[data-val=true]").each(function () {
$jQval.unobtrusive.parseElement(this, true);
});
$forms.each(function()
{
$forms.each(function () {
var info = validationInfo(this);
if(info)
{
if (info) {
info.attachValidation();
}
});
@@ -296,8 +253,7 @@
adapters = $jQval.unobtrusive.adapters;
adapters.add = function(adapterName, params, fn)
{
adapters.add = function (adapterName, params, fn) {
/// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation.</summary>
/// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
/// in the data-val-nnnn HTML attribute (where nnnn is the adapter name).</param>
@@ -307,8 +263,7 @@
/// <param name="fn" type="Function">The function to call, which adapts the values from the HTML
/// attributes into jQuery Validate rules and/or messages.</param>
/// <returns type="jQuery.validator.unobtrusive.adapters" />
if(!fn)
{ // Called with no params, just a function
if (!fn) { // Called with no params, just a function
fn = params;
params = [];
}
@@ -316,8 +271,7 @@
return this;
};
adapters.addBool = function(adapterName, ruleName)
{
adapters.addBool = function (adapterName, ruleName) {
/// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
/// the jQuery Validate validation rule has no parameter values.</summary>
/// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
@@ -325,14 +279,12 @@
/// <param name="ruleName" type="String" optional="true">[Optional] The name of the jQuery Validate rule. If not provided, the value
/// of adapterName will be used instead.</param>
/// <returns type="jQuery.validator.unobtrusive.adapters" />
return this.add(adapterName, function(options)
{
return this.add(adapterName, function (options) {
setValidationValues(options, ruleName || adapterName, true);
});
};
adapters.addMinMax = function(adapterName, minRuleName, maxRuleName, minMaxRuleName, minAttribute, maxAttribute)
{
adapters.addMinMax = function (adapterName, minRuleName, maxRuleName, minMaxRuleName, minAttribute, maxAttribute) {
/// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
/// the jQuery Validate validation has three potential rules (one for min-only, one for max-only, and
/// one for min-and-max). The HTML parameters are expected to be named -min and -max.</summary>
@@ -349,26 +301,21 @@
/// <param name="maxAttribute" type="String" optional="true">[Optional] The name of the HTML attribute that
/// contains the maximum value. The default is "max".</param>
/// <returns type="jQuery.validator.unobtrusive.adapters" />
return this.add(adapterName, [minAttribute || "min", maxAttribute || "max"], function(options)
{
return this.add(adapterName, [minAttribute || "min", maxAttribute || "max"], function (options) {
var min = options.params.min,
max = options.params.max;
if(min && max)
{
if (min && max) {
setValidationValues(options, minMaxRuleName, [min, max]);
} else if(min)
{
} else if (min) {
setValidationValues(options, minRuleName, min);
} else if(max)
{
} else if (max) {
setValidationValues(options, maxRuleName, max);
}
});
};
adapters.addSingleVal = function(adapterName, attribute, ruleName)
{
adapters.addSingleVal = function (adapterName, attribute, ruleName) {
/// <summary>Adds a new adapter to convert unobtrusive HTML into a jQuery Validate validation, where
/// the jQuery Validate validation rule has a single value.</summary>
/// <param name="adapterName" type="String">The name of the adapter to be added. This matches the name used
@@ -378,22 +325,18 @@
/// <param name="ruleName" type="String" optional="true">[Optional] The name of the jQuery Validate rule. If not provided, the value
/// of adapterName will be used instead.</param>
/// <returns type="jQuery.validator.unobtrusive.adapters" />
return this.add(adapterName, [attribute || "val"], function(options)
{
return this.add(adapterName, [attribute || "val"], function (options) {
setValidationValues(options, ruleName || adapterName, options.params[attribute]);
});
};
$jQval.addMethod("__dummy__", function(value, element, params)
{
$jQval.addMethod("__dummy__", function (value, element, params) {
return true;
});
$jQval.addMethod("regex", function(value, element, params)
{
$jQval.addMethod("regex", function (value, element, params) {
var match;
if(this.optional(element))
{
if (this.optional(element)) {
return true;
}
@@ -401,23 +344,19 @@
return (match && (match.index === 0) && (match[0].length === value.length));
});
$jQval.addMethod("nonalphamin", function(value, element, nonalphamin)
{
$jQval.addMethod("nonalphamin", function (value, element, nonalphamin) {
var match;
if(nonalphamin)
{
if (nonalphamin) {
match = value.match(/\W/g);
match = match && match.length >= nonalphamin;
}
return match;
});
if($jQval.methods.extension)
{
if ($jQval.methods.extension) {
adapters.addSingleVal("accept", "mimtype");
adapters.addSingleVal("extension", "extension");
} else
{
} else {
// for backward compatibility, when the 'extension' validation method does not exist, such as with versions
// of JQuery Validation plugin prior to 1.10, we should use the 'accept' method for
// validating the extension, and ignore mime-type validations as they are not supported.
@@ -428,8 +367,7 @@
adapters.addBool("creditcard").addBool("date").addBool("digits").addBool("email").addBool("number").addBool("url");
adapters.addMinMax("length", "minlength", "maxlength", "rangelength").addMinMax("range", "min", "max", "range");
adapters.addMinMax("minlength", "minlength").addMinMax("maxlength", "minlength", "maxlength");
adapters.add("equalto", ["other"], function(options)
{
adapters.add("equalto", ["other"], function (options) {
var prefix = getModelPrefix(options.element.name),
other = options.params.other,
fullOtherName = appendModelPrefix(other, prefix),
@@ -437,16 +375,13 @@
setValidationValues(options, "equalTo", element);
});
adapters.add("required", function(options)
{
adapters.add("required", function (options) {
// jQuery Validate equates "required" with "mandatory" for checkbox elements
if(options.element.tagName.toUpperCase() !== "INPUT" || options.element.type.toUpperCase() !== "CHECKBOX")
{
if (options.element.tagName.toUpperCase() !== "INPUT" || options.element.type.toUpperCase() !== "CHECKBOX") {
setValidationValues(options, "required", true);
}
});
adapters.add("remote", ["url", "type", "additionalfields"], function(options)
{
adapters.add("remote", ["url", "type", "additionalfields"], function (options) {
var value = {
url: options.params.url,
type: options.params.type || "GET",
@@ -454,18 +389,14 @@
},
prefix = getModelPrefix(options.element.name);
$.each(splitAndTrim(options.params.additionalfields || options.element.name), function(i, fieldName)
{
$.each(splitAndTrim(options.params.additionalfields || options.element.name), function (i, fieldName) {
var paramName = appendModelPrefix(fieldName, prefix);
value.data[paramName] = function()
{
value.data[paramName] = function () {
var field = $(options.form).find(":input").filter("[name='" + escapeAttributeValue(paramName) + "']");
// For checkboxes and radio buttons, only pick up values from checked fields.
if(field.is(":checkbox"))
{
if (field.is(":checkbox")) {
return field.filter(":checked").val() || field.filter(":hidden").val() || '';
} else if(field.is(":radio"))
{
} else if (field.is(":radio")) {
return field.filter(":checked").val() || '';
}
return field.val();
@@ -474,28 +405,22 @@
setValidationValues(options, "remote", value);
});
adapters.add("password", ["min", "nonalphamin", "regex"], function(options)
{
if(options.params.min)
{
adapters.add("password", ["min", "nonalphamin", "regex"], function (options) {
if (options.params.min) {
setValidationValues(options, "minlength", options.params.min);
}
if(options.params.nonalphamin)
{
if (options.params.nonalphamin) {
setValidationValues(options, "nonalphamin", options.params.nonalphamin);
}
if(options.params.regex)
{
if (options.params.regex) {
setValidationValues(options, "regex", options.params.regex);
}
});
adapters.add("fileextensions", ["extensions"], function(options)
{
adapters.add("fileextensions", ["extensions"], function (options) {
setValidationValues(options, "extension", options.params.extensions);
});
$(function()
{
$(function () {
$jQval.unobtrusive.parse(document);
});

View File

@@ -6,26 +6,19 @@
* Copyright (c) 2017 Jörn Zaefferer
* Released under the MIT license
*/
(function(factory)
{
if(typeof define === "function" && define.amd)
{
(function (factory) {
if (typeof define === "function" && define.amd) {
define(["jquery", "./jquery.validate"], factory);
} else if(typeof module === "object" && module.exports)
{
} else if (typeof module === "object" && module.exports) {
module.exports = factory(require("jquery"));
} else
{
} else {
factory(jQuery);
}
}(function($)
{
}(function ($) {
(function()
{
(function () {
function stripHtml(value)
{
function stripHtml(value) {
// Remove html tags and space chars
return value.replace(/<.[^<>]*?>/g, " ").replace(/&nbsp;|&#160;/gi, " ")
@@ -34,18 +27,15 @@
.replace(/[.(),;:!?%#$'\"_+=\/\-“”’]*/g, "");
}
$.validator.addMethod("maxWords", function(value, element, params)
{
$.validator.addMethod("maxWords", function (value, element, params) {
return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length <= params;
}, $.validator.format("Please enter {0} words or less."));
$.validator.addMethod("minWords", function(value, element, params)
{
$.validator.addMethod("minWords", function (value, element, params) {
return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params;
}, $.validator.format("Please enter at least {0} words."));
$.validator.addMethod("rangeWords", function(value, element, params)
{
$.validator.addMethod("rangeWords", function (value, element, params) {
var valueStripped = stripHtml(value),
regex = /\b\w+\b/g;
return this.optional(element) || valueStripped.match(regex).length >= params[0] && valueStripped.match(regex).length <= params[1];
@@ -54,8 +44,7 @@
}());
// Accept a value from a file input based on a required mimetype
$.validator.addMethod("accept", function(value, element, param)
{
$.validator.addMethod("accept", function (value, element, param) {
// Split mime on commas in case we have multiple types we can accept
var typeParam = typeof param === "string" ? param.replace(/\s/g, "") : "image/*",
@@ -63,13 +52,11 @@
i, file, regex;
// Element is optional
if(optionalValue)
{
if (optionalValue) {
return optionalValue;
}
if($(element).attr("type") === "file")
{
if ($(element).attr("type") === "file") {
// Escape string to be used in the regex
// see: https://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
@@ -80,16 +67,13 @@
.replace(/\/\*/g, "/.*");
// Check if the element has a FileList before checking each file
if(element.files && element.files.length)
{
if (element.files && element.files.length) {
regex = new RegExp(".?(" + typeParam + ")$", "i");
for(i = 0; i < element.files.length; i++)
{
for (i = 0; i < element.files.length; i++) {
file = element.files[i];
// Grab the mimetype from the loaded file, verify it matches
if(!file.type.match(regex))
{
if (!file.type.match(regex)) {
return false;
}
}
@@ -101,8 +85,7 @@
return true;
}, $.validator.format("Please enter a value with a valid mimetype."));
$.validator.addMethod("alphanumeric", function(value, element)
{
$.validator.addMethod("alphanumeric", function (value, element) {
return this.optional(element) || /^\w+$/i.test(value);
}, "Letters, numbers, and underscores only please");
@@ -112,14 +95,11 @@
* We accept the notation with spaces, as that is common.
* acceptable: 123456789 or 12 34 56 789
*/
$.validator.addMethod("bankaccountNL", function(value, element)
{
if(this.optional(element))
{
$.validator.addMethod("bankaccountNL", function (value, element) {
if (this.optional(element)) {
return true;
}
if(!(/^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test(value)))
{
if (!(/^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test(value))) {
return false;
}
@@ -128,8 +108,7 @@
sum = 0,
len = account.length,
pos, factor, digit;
for(pos = 0; pos < len; pos++)
{
for (pos = 0; pos < len; pos++) {
factor = len - pos;
digit = account.substring(pos, pos + 1);
sum = sum + factor * digit;
@@ -137,8 +116,7 @@
return sum % 11 === 0;
}, "Please specify a valid bank account number");
$.validator.addMethod("bankorgiroaccountNL", function(value, element)
{
$.validator.addMethod("bankorgiroaccountNL", function (value, element) {
return this.optional(element) ||
($.validator.methods.bankaccountNL.call(this, value, element)) ||
($.validator.methods.giroaccountNL.call(this, value, element));
@@ -159,8 +137,7 @@
* b. second character must be a letter ('O' is not allowed) or digit ('0' for test (therefore not allowed), '1' denoting passive participant, '2' typically reverse-billing)
* - Last 3 characters - branch code, optional (shall not start with 'X' except in case of 'XXX' for primary office) (letters and digits)
*/
$.validator.addMethod("bic", function(value, element)
{
$.validator.addMethod("bic", function (value, element) {
return this.optional(element) || /^([A-Z]{6}[A-Z2-9][A-NP-Z1-9])(X{3}|[A-WY-Z0-9][A-Z0-9]{2})?$/.test(value.toUpperCase());
}, "Please specify a valid BIC code");
@@ -214,12 +191,10 @@
* S Letter
*
*/
$.validator.addMethod("cifES", function(value, element)
{
$.validator.addMethod("cifES", function (value, element) {
"use strict";
if(this.optional(element))
{
if (this.optional(element)) {
return true;
}
@@ -234,24 +209,20 @@
control_digit,
control_letter;
function isOdd(n)
{
function isOdd(n) {
return n % 2 === 0;
}
// Quick format test
if(value.length !== 9 || !cifRegEx.test(value))
{
if (value.length !== 9 || !cifRegEx.test(value)) {
return false;
}
for(i = 0; i < number.length; i++)
{
for (i = 0; i < number.length; i++) {
n = parseInt(number[i], 10);
// Odd positions
if(isOdd(i))
{
if (isOdd(i)) {
// Odd positions are multiplied first.
n *= 2;
@@ -261,8 +232,7 @@
// Even positions
// Just sum them
} else
{
} else {
even_sum += n;
}
}
@@ -273,13 +243,11 @@
control_letter = "JABCDEFGHI".substr(control_digit, 1).toString();
// Control must be a digit
if(letter.match(/[ABEH]/))
{
if (letter.match(/[ABEH]/)) {
return control === control_digit;
// Control must be a letter
} else if(letter.match(/[KPQS]/))
{
} else if (letter.match(/[KPQS]/)) {
return control === control_letter;
}
@@ -292,15 +260,13 @@
* Brazillian CPF number (Cadastrado de Pessoas Físicas) is the equivalent of a Brazilian tax registration number.
* CPF numbers have 11 digits in total: 9 numbers followed by 2 check numbers that are being used for validation.
*/
$.validator.addMethod("cpfBR", function(value)
{
$.validator.addMethod("cpfBR", function (value) {
// Removing special characters from value
value = value.replace(/([~!@#$%^&*()_+=`{}\[\]\-|\\:;'<>,.\/? ])+/g, "");
// Checking value to have 11 digits only
if(value.length !== 11)
{
if (value.length !== 11) {
return false;
}
@@ -310,18 +276,16 @@
firstCN = parseInt(value.substring(9, 10), 10);
secondCN = parseInt(value.substring(10, 11), 10);
checkResult = function(sum, cn)
{
checkResult = function (sum, cn) {
var result = (sum * 10) % 11;
if((result === 10) || (result === 11))
{
if ((result === 10) || (result === 11)) {
result = 0;
}
return (result === cn);
};
// Checking for dump data
if(value === "" ||
if (value === "" ||
value === "00000000000" ||
value === "11111111111" ||
value === "22222222222" ||
@@ -332,23 +296,19 @@
value === "77777777777" ||
value === "88888888888" ||
value === "99999999999"
)
{
) {
return false;
}
// Step 1 - using first Check Number:
for(i = 1; i <= 9; i++)
{
for (i = 1; i <= 9; i++) {
sum = sum + parseInt(value.substring(i - 1, i), 10) * (11 - i);
}
// If first Check Number (CN) is valid, move to Step 2 - using second Check Number:
if(checkResult(sum, firstCN))
{
if (checkResult(sum, firstCN)) {
sum = 0;
for(i = 1; i <= 10; i++)
{
for (i = 1; i <= 10; i++) {
sum = sum + parseInt(value.substring(i - 1, i), 10) * (12 - i);
}
return checkResult(sum, secondCN);
@@ -359,16 +319,13 @@
// https://jqueryvalidation.org/creditcard-method/
// based on https://en.wikipedia.org/wiki/Luhn_algorithm
$.validator.addMethod("creditcard", function(value, element)
{
if(this.optional(element))
{
$.validator.addMethod("creditcard", function (value, element) {
if (this.optional(element)) {
return "dependency-mismatch";
}
// Accept only spaces, digits and dashes
if(/[^0-9 \-]+/.test(value))
{
if (/[^0-9 \-]+/.test(value)) {
return false;
}
@@ -381,19 +338,15 @@
// Basing min and max length on
// https://developer.ean.com/general_info/Valid_Credit_Card_Types
if(value.length < 13 || value.length > 19)
{
if (value.length < 13 || value.length > 19) {
return false;
}
for(n = value.length - 1; n >= 0; n--)
{
for (n = value.length - 1; n >= 0; n--) {
cDigit = value.charAt(n);
nDigit = parseInt(cDigit, 10);
if(bEven)
{
if((nDigit *= 2) > 9)
{
if (bEven) {
if ((nDigit *= 2) > 9) {
nDigit -= 9;
}
}
@@ -409,10 +362,8 @@
* Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0
* Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings)
*/
$.validator.addMethod("creditcardtypes", function(value, element, param)
{
if(/[^0-9\-]+/.test(value))
{
$.validator.addMethod("creditcardtypes", function (value, element, param) {
if (/[^0-9\-]+/.test(value)) {
return false;
}
@@ -420,76 +371,58 @@
var validTypes = 0x0000;
if(param.mastercard)
{
if (param.mastercard) {
validTypes |= 0x0001;
}
if(param.visa)
{
if (param.visa) {
validTypes |= 0x0002;
}
if(param.amex)
{
if (param.amex) {
validTypes |= 0x0004;
}
if(param.dinersclub)
{
if (param.dinersclub) {
validTypes |= 0x0008;
}
if(param.enroute)
{
if (param.enroute) {
validTypes |= 0x0010;
}
if(param.discover)
{
if (param.discover) {
validTypes |= 0x0020;
}
if(param.jcb)
{
if (param.jcb) {
validTypes |= 0x0040;
}
if(param.unknown)
{
if (param.unknown) {
validTypes |= 0x0080;
}
if(param.all)
{
if (param.all) {
validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080;
}
if(validTypes & 0x0001 && /^(5[12345])/.test(value))
{ // Mastercard
if (validTypes & 0x0001 && /^(5[12345])/.test(value)) { // Mastercard
return value.length === 16;
}
if(validTypes & 0x0002 && /^(4)/.test(value))
{ // Visa
if (validTypes & 0x0002 && /^(4)/.test(value)) { // Visa
return value.length === 16;
}
if(validTypes & 0x0004 && /^(3[47])/.test(value))
{ // Amex
if (validTypes & 0x0004 && /^(3[47])/.test(value)) { // Amex
return value.length === 15;
}
if(validTypes & 0x0008 && /^(3(0[012345]|[68]))/.test(value))
{ // Dinersclub
if (validTypes & 0x0008 && /^(3(0[012345]|[68]))/.test(value)) { // Dinersclub
return value.length === 14;
}
if(validTypes & 0x0010 && /^(2(014|149))/.test(value))
{ // Enroute
if (validTypes & 0x0010 && /^(2(014|149))/.test(value)) { // Enroute
return value.length === 15;
}
if(validTypes & 0x0020 && /^(6011)/.test(value))
{ // Discover
if (validTypes & 0x0020 && /^(6011)/.test(value)) { // Discover
return value.length === 16;
}
if(validTypes & 0x0040 && /^(3)/.test(value))
{ // Jcb
if (validTypes & 0x0040 && /^(3)/.test(value)) { // Jcb
return value.length === 16;
}
if(validTypes & 0x0040 && /^(2131|1800)/.test(value))
{ // Jcb
if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { // Jcb
return value.length === 15;
}
if(validTypes & 0x0080)
{ // Unknown
if (validTypes & 0x0080) { // Unknown
return true;
}
return false;
@@ -523,8 +456,7 @@
* currency: "$,£,¢"
* }
*/
$.validator.addMethod("currency", function(value, element, param)
{
$.validator.addMethod("currency", function (value, element, param) {
var isParamString = typeof param === "string",
symbol = isParamString ? param : param[0],
soft = isParamString ? true : param[1],
@@ -538,8 +470,7 @@
}, "Please specify a valid currency");
$.validator.addMethod("dateFA", function(value, element)
{
$.validator.addMethod("dateFA", function (value, element) {
return this.optional(element) || /^[1-4]\d{3}\/((0?[1-6]\/((3[0-1])|([1-2][0-9])|(0?[1-9])))|((1[0-2]|(0?[7-9]))\/(30|([1-2][0-9])|(0?[1-9]))))$/.test(value);
}, $.validator.messages.date);
@@ -562,40 +493,33 @@
* @type Boolean
* @cat Plugins/Validate/Methods
*/
$.validator.addMethod("dateITA", function(value, element)
{
$.validator.addMethod("dateITA", function (value, element) {
var check = false,
re = /^\d{1,2}\/\d{1,2}\/\d{4}$/,
adata, gg, mm, aaaa, xdata;
if(re.test(value))
{
if (re.test(value)) {
adata = value.split("/");
gg = parseInt(adata[0], 10);
mm = parseInt(adata[1], 10);
aaaa = parseInt(adata[2], 10);
xdata = new Date(Date.UTC(aaaa, mm - 1, gg, 12, 0, 0, 0));
if((xdata.getUTCFullYear() === aaaa) && (xdata.getUTCMonth() === mm - 1) && (xdata.getUTCDate() === gg))
{
if ((xdata.getUTCFullYear() === aaaa) && (xdata.getUTCMonth() === mm - 1) && (xdata.getUTCDate() === gg)) {
check = true;
} else
{
} else {
check = false;
}
} else
{
} else {
check = false;
}
return this.optional(element) || check;
}, $.validator.messages.date);
$.validator.addMethod("dateNL", function(value, element)
{
$.validator.addMethod("dateNL", function (value, element) {
return this.optional(element) || /^(0?[1-9]|[12]\d|3[01])[\.\/\-](0?[1-9]|1[012])[\.\/\-]([12]\d)?(\d\d)$/.test(value);
}, $.validator.messages.date);
// Older "accept" file extension method. Old docs: http://docs.jquery.com/Plugins/Validation/Methods/accept
$.validator.addMethod("extension", function(value, element, param)
{
$.validator.addMethod("extension", function (value, element, param) {
param = typeof param === "string" ? param.replace(/,/g, "|") : "png|jpe?g|gif";
return this.optional(element) || value.match(new RegExp("\\.(" + param + ")$", "i"));
}, $.validator.format("Please enter a value with a valid extension."));
@@ -603,8 +527,7 @@
/**
* Dutch giro account numbers (not bank numbers) have max 7 digits
*/
$.validator.addMethod("giroaccountNL", function(value, element)
{
$.validator.addMethod("giroaccountNL", function (value, element) {
return this.optional(element) || /^[0-9]{1,7}$/.test(value);
}, "Please specify a valid giro account number");
@@ -614,12 +537,10 @@
*
* Validation is case-insensitive. Please make sure to normalize input yourself.
*/
$.validator.addMethod("iban", function(value, element)
{
$.validator.addMethod("iban", function (value, element) {
// Some quick simple tests to prevent needless work
if(this.optional(element))
{
if (this.optional(element)) {
return true;
}
@@ -637,8 +558,7 @@
// two check digits,
// Basic Bank Account Number (BBAN) - up to 30 chars
var minimalIBANlength = 5;
if(iban.length < minimalIBANlength)
{
if (iban.length < minimalIBANlength) {
return false;
}
@@ -720,33 +640,27 @@
// by the checksum validation below anyway.
// Strict checking should return FALSE for unknown
// countries.
if(typeof bbanpattern !== "undefined")
{
if (typeof bbanpattern !== "undefined") {
ibanregexp = new RegExp("^[A-Z]{2}\\d{2}" + bbanpattern + "$", "");
if(!(ibanregexp.test(iban)))
{
if (!(ibanregexp.test(iban))) {
return false; // Invalid country specific format
}
}
// Now check the checksum, first convert to digits
ibancheck = iban.substring(4, iban.length) + iban.substring(0, 4);
for(i = 0; i < ibancheck.length; i++)
{
for (i = 0; i < ibancheck.length; i++) {
charAt = ibancheck.charAt(i);
if(charAt !== "0")
{
if (charAt !== "0") {
leadingZeroes = false;
}
if(!leadingZeroes)
{
if (!leadingZeroes) {
ibancheckdigits += "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(charAt);
}
}
// Calculate the result of: ibancheckdigits % 97
for(p = 0; p < ibancheckdigits.length; p++)
{
for (p = 0; p < ibancheckdigits.length; p++) {
cChar = ibancheckdigits.charAt(p);
cOperator = "" + cRest + "" + cChar;
cRest = cOperator % 97;
@@ -754,33 +668,27 @@
return cRest === 1;
}, "Please specify a valid IBAN");
$.validator.addMethod("integer", function(value, element)
{
$.validator.addMethod("integer", function (value, element) {
return this.optional(element) || /^-?\d+$/.test(value);
}, "A positive or negative non-decimal number please");
$.validator.addMethod("ipv4", function(value, element)
{
$.validator.addMethod("ipv4", function (value, element) {
return this.optional(element) || /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i.test(value);
}, "Please enter a valid IP v4 address.");
$.validator.addMethod("ipv6", function(value, element)
{
$.validator.addMethod("ipv6", function (value, element) {
return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
}, "Please enter a valid IP v6 address.");
$.validator.addMethod("lettersonly", function(value, element)
{
$.validator.addMethod("lettersonly", function (value, element) {
return this.optional(element) || /^[a-z]+$/i.test(value);
}, "Letters only please");
$.validator.addMethod("letterswithbasicpunc", function(value, element)
{
$.validator.addMethod("letterswithbasicpunc", function (value, element) {
return this.optional(element) || /^[a-z\-.,()'"\s]+$/i.test(value);
}, "Letters or punctuation only please");
$.validator.addMethod("mobileNL", function(value, element)
{
$.validator.addMethod("mobileNL", function (value, element) {
return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)6((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
}, "Please specify a valid mobile number");
@@ -792,15 +700,13 @@
* A number of very detailed GB telephone number RegEx patterns can also be found at:
* http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
*/
$.validator.addMethod("mobileUK", function(phone_number, element)
{
$.validator.addMethod("mobileUK", function (phone_number, element) {
phone_number = phone_number.replace(/\(|\)|\s+|-/g, "");
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)7(?:[1345789]\d{2}|624)\s?\d{3}\s?\d{3})$/);
}, "Please specify a valid mobile number");
$.validator.addMethod("netmask", function(value, element)
{
$.validator.addMethod("netmask", function (value, element) {
return this.optional(element) || /^(254|252|248|240|224|192|128)\.0\.0\.0|255\.(254|252|248|240|224|192|128|0)\.0\.0|255\.255\.(254|252|248|240|224|192|128|0)\.0|255\.255\.255\.(254|252|248|240|224|192|128|0)/i.test(value);
}, "Please enter a valid netmask.");
@@ -812,12 +718,10 @@
* identification number. The CIF number (Certificado de Identificación Fiscal) is equivalent to the NIF, but applies to
* companies rather than individuals. The NIE consists of an 'X' or 'Y' followed by 7 or 8 digits then another letter.
*/
$.validator.addMethod("nieES", function(value, element)
{
$.validator.addMethod("nieES", function (value, element) {
"use strict";
if(this.optional(element))
{
if (this.optional(element)) {
return true;
}
@@ -829,8 +733,7 @@
value = value.toString().toUpperCase();
// Quick format test
if(value.length > 10 || value.length < 9 || !nieRegEx.test(value))
{
if (value.length > 10 || value.length < 9 || !nieRegEx.test(value)) {
return false;
}
@@ -850,32 +753,27 @@
/*
* The Número de Identificación Fiscal ( NIF ) is the way tax identification used in Spain for individuals
*/
$.validator.addMethod("nifES", function(value, element)
{
$.validator.addMethod("nifES", function (value, element) {
"use strict";
if(this.optional(element))
{
if (this.optional(element)) {
return true;
}
value = value.toUpperCase();
// Basic format test
if(!value.match("((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)"))
{
if (!value.match("((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)")) {
return false;
}
// Test NIF
if(/^[0-9]{8}[A-Z]{1}$/.test(value))
{
if (/^[0-9]{8}[A-Z]{1}$/.test(value)) {
return ("TRWAGMYFPDXBNJZSQVHLCKE".charAt(value.substring(8, 0) % 23) === value.charAt(8));
}
// Test specials NIF (starts with K, L or M)
if(/^[KLM]{1}/.test(value))
{
if (/^[KLM]{1}/.test(value)) {
return (value[8] === "TRWAGMYFPDXBNJZSQVHLCKE".charAt(value.substring(8, 1) % 23));
}
@@ -886,21 +784,18 @@
/*
* Numer identyfikacji podatkowej ( NIP ) is the way tax identification used in Poland for companies
*/
$.validator.addMethod("nipPL", function(value)
{
$.validator.addMethod("nipPL", function (value) {
"use strict";
value = value.replace(/[^0-9]/g, "");
if(value.length !== 10)
{
if (value.length !== 10) {
return false;
}
var arrSteps = [6, 5, 7, 2, 3, 4, 5, 6, 7];
var intSum = 0;
for(var i = 0; i < 9; i++)
{
for (var i = 0; i < 9; i++) {
intSum += arrSteps[i] * value[i];
}
var int2 = intSum % 11;
@@ -909,13 +804,11 @@
return (intControlNr === parseInt(value[9], 10));
}, "Please specify a valid NIP number.");
$.validator.addMethod("notEqualTo", function(value, element, param)
{
$.validator.addMethod("notEqualTo", function (value, element, param) {
return this.optional(element) || !$.validator.methods.equalTo.call(this, value, element, param);
}, "Please enter a different value, values must not be the same.");
$.validator.addMethod("nowhitespace", function(value, element)
{
$.validator.addMethod("nowhitespace", function (value, element) {
return this.optional(element) || /^\S+$/i.test(value);
}, "No white space please");
@@ -932,14 +825,11 @@
* @type Boolean
* @cat Plugins/Validate/Methods
*/
$.validator.addMethod("pattern", function(value, element, param)
{
if(this.optional(element))
{
$.validator.addMethod("pattern", function (value, element, param) {
if (this.optional(element)) {
return true;
}
if(typeof param === "string")
{
if (typeof param === "string") {
param = new RegExp("^(?:" + param + ")$");
}
return param.test(value);
@@ -948,8 +838,7 @@
/**
* Dutch phone numbers have 10 digits (or 11 and start with +31).
*/
$.validator.addMethod("phoneNL", function(value, element)
{
$.validator.addMethod("phoneNL", function (value, element) {
return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
}, "Please specify a valid phone number.");
@@ -963,8 +852,7 @@
*/
// Matches UK landline + mobile, accepting only 01-3 for landline or 07 for mobile to exclude many premium numbers
$.validator.addMethod("phonesUK", function(phone_number, element)
{
$.validator.addMethod("phonesUK", function (phone_number, element) {
phone_number = phone_number.replace(/\(|\)|\s+|-/g, "");
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)(?:1\d{8,9}|[23]\d{9}|7(?:[1345789]\d{8}|624\d{6})))$/);
@@ -978,8 +866,7 @@
* A number of very detailed GB telephone number RegEx patterns can also be found at:
* http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
*/
$.validator.addMethod("phoneUK", function(phone_number, element)
{
$.validator.addMethod("phoneUK", function (phone_number, element) {
phone_number = phone_number.replace(/\(|\)|\s+|-/g, "");
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?)|(?:\(?0))(?:\d{2}\)?\s?\d{4}\s?\d{4}|\d{3}\)?\s?\d{3}\s?\d{3,4}|\d{4}\)?\s?(?:\d{5}|\d{3}\s?\d{3})|\d{5}\)?\s?\d{4,5})$/);
@@ -1001,8 +888,7 @@
* and not
* 212 123 4567
*/
$.validator.addMethod("phoneUS", function(phone_number, element)
{
$.validator.addMethod("phoneUS", function (phone_number, element) {
phone_number = phone_number.replace(/\s+/g, "");
return this.optional(element) || phone_number.length > 9 &&
phone_number.match(/^(\+?1-?)?(\([2-9]([02-9]\d|1[02-9])\)|[2-9]([02-9]\d|1[02-9]))-?[2-9]([02-9]\d|1[02-9])-?\d{4}$/);
@@ -1016,8 +902,7 @@
* 99.999-999
* 99999999
*/
$.validator.addMethod("postalcodeBR", function(cep_value, element)
{
$.validator.addMethod("postalcodeBR", function (cep_value, element) {
return this.optional(element) || /^\d{2}.\d{3}-\d{3}?$|^\d{5}-?\d{3}?$/.test(cep_value);
}, "Informe um CEP válido.");
@@ -1034,25 +919,21 @@
* @type Boolean
* @cat Plugins/Validate/Methods
*/
$.validator.addMethod("postalCodeCA", function(value, element)
{
$.validator.addMethod("postalCodeCA", function (value, element) {
return this.optional(element) || /^[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ] *\d[ABCEGHJKLMNPRSTVWXYZ]\d$/i.test(value);
}, "Please specify a valid postal code");
/* Matches Italian postcode (CAP) */
$.validator.addMethod("postalcodeIT", function(value, element)
{
$.validator.addMethod("postalcodeIT", function (value, element) {
return this.optional(element) || /^\d{5}$/.test(value);
}, "Please specify a valid postal code");
$.validator.addMethod("postalcodeNL", function(value, element)
{
$.validator.addMethod("postalcodeNL", function (value, element) {
return this.optional(element) || /^[1-9][0-9]{3}\s?[a-zA-Z]{2}$/.test(value);
}, "Please specify a valid postal code");
// Matches UK postcode. Does not match to UK Channel Islands that have their own postcodes (non standard UK)
$.validator.addMethod("postcodeUK", function(value, element)
{
$.validator.addMethod("postcodeUK", function (value, element) {
return this.optional(element) || /^((([A-PR-UWYZ][0-9])|([A-PR-UWYZ][0-9][0-9])|([A-PR-UWYZ][A-HK-Y][0-9])|([A-PR-UWYZ][A-HK-Y][0-9][0-9])|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))\s?([0-9][ABD-HJLNP-UW-Z]{2})|(GIR)\s?(0AA))$/i.test(value);
}, "Please specify a valid UK postcode");
@@ -1072,13 +953,11 @@
* options[0]: number of fields that must be filled in the group
* options[1]: CSS selector that defines the group of conditionally required fields
*/
$.validator.addMethod("require_from_group", function(value, element, options)
{
$.validator.addMethod("require_from_group", function (value, element, options) {
var $fields = $(options[1], element.form),
$fieldsFirst = $fields.eq(0),
validator = $fieldsFirst.data("valid_req_grp") ? $fieldsFirst.data("valid_req_grp") : $.extend({}, this),
isValid = $fields.filter(function()
{
isValid = $fields.filter(function () {
return validator.elementValue(this);
}).length >= options[0];
@@ -1086,11 +965,9 @@
$fieldsFirst.data("valid_req_grp", validator);
// If element isn't being validated, run each require_from_group field's validation rules
if(!$(element).data("being_validated"))
{
if (!$(element).data("being_validated")) {
$fields.data("being_validated", true);
$fields.each(function()
{
$fields.each(function () {
validator.element(this);
});
$fields.data("being_validated", false);
@@ -1119,13 +996,11 @@
* options[1]: CSS selector that defines the group of conditionally required fields
*
*/
$.validator.addMethod("skip_or_fill_minimum", function(value, element, options)
{
$.validator.addMethod("skip_or_fill_minimum", function (value, element, options) {
var $fields = $(options[1], element.form),
$fieldsFirst = $fields.eq(0),
validator = $fieldsFirst.data("valid_skip") ? $fieldsFirst.data("valid_skip") : $.extend({}, this),
numberFilled = $fields.filter(function()
{
numberFilled = $fields.filter(function () {
return validator.elementValue(this);
}).length,
isValid = numberFilled === 0 || numberFilled >= options[0];
@@ -1134,11 +1009,9 @@
$fieldsFirst.data("valid_skip", validator);
// If element isn't being validated, run each skip_or_fill_minimum field's validation rules
if(!$(element).data("being_validated"))
{
if (!$(element).data("being_validated")) {
$fields.data("being_validated", true);
$fields.each(function()
{
$fields.each(function () {
validator.element(this);
});
$fields.data("being_validated", false);
@@ -1180,25 +1053,20 @@
* }
*
*/
$.validator.addMethod("stateUS", function(value, element, options)
{
$.validator.addMethod("stateUS", function (value, element, options) {
var isDefault = typeof options === "undefined",
caseSensitive = (isDefault || typeof options.caseSensitive === "undefined") ? false : options.caseSensitive,
includeTerritories = (isDefault || typeof options.includeTerritories === "undefined") ? false : options.includeTerritories,
includeMilitary = (isDefault || typeof options.includeMilitary === "undefined") ? false : options.includeMilitary,
regex;
if(!includeTerritories && !includeMilitary)
{
if (!includeTerritories && !includeMilitary) {
regex = "^(A[KLRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$";
} else if(includeTerritories && includeMilitary)
{
} else if (includeTerritories && includeMilitary) {
regex = "^(A[AEKLPRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$";
} else if(includeTerritories)
{
} else if (includeTerritories) {
regex = "^(A[KLRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$";
} else
{
} else {
regex = "^(A[AEKLPRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$";
}
@@ -1207,24 +1075,20 @@
}, "Please specify a valid state");
// TODO check if value starts with <, otherwise don't try stripping anything
$.validator.addMethod("strippedminlength", function(value, element, param)
{
$.validator.addMethod("strippedminlength", function (value, element, param) {
return $(value).text().length >= param;
}, $.validator.format("Please enter at least {0} characters"));
$.validator.addMethod("time", function(value, element)
{
$.validator.addMethod("time", function (value, element) {
return this.optional(element) || /^([01]\d|2[0-3]|[0-9])(:[0-5]\d){1,2}$/.test(value);
}, "Please enter a valid time, between 00:00 and 23:59");
$.validator.addMethod("time12h", function(value, element)
{
$.validator.addMethod("time12h", function (value, element) {
return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){1,2}(\ ?[AP]M))$/i.test(value);
}, "Please enter a valid time in 12-hour am/pm format");
// Same as url, but TLD is optional
$.validator.addMethod("url2", function(value, element)
{
$.validator.addMethod("url2", function (value, element) {
return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
}, $.validator.messages.url);
@@ -1240,10 +1104,8 @@
* @type Boolean
* @cat Plugins/Validate/Methods
*/
$.validator.addMethod("vinUS", function(v)
{
if(v.length !== 17)
{
$.validator.addMethod("vinUS", function (v) {
if (v.length !== 17) {
return false;
}
@@ -1253,27 +1115,20 @@
rs = 0,
i, n, d, f, cd, cdv;
for(i = 0; i < 17; i++)
{
for (i = 0; i < 17; i++) {
f = FL[i];
d = v.slice(i, i + 1);
if(i === 8)
{
if (i === 8) {
cdv = d;
}
if(!isNaN(d))
{
if (!isNaN(d)) {
d *= f;
} else
{
for(n = 0; n < LL.length; n++)
{
if(d.toUpperCase() === LL[n])
{
} else {
for (n = 0; n < LL.length; n++) {
if (d.toUpperCase() === LL[n]) {
d = VL[n];
d *= f;
if(isNaN(cdv) && n === 8)
{
if (isNaN(cdv) && n === 8) {
cdv = LL[n];
}
break;
@@ -1283,24 +1138,20 @@
rs += d;
}
cd = rs % 11;
if(cd === 10)
{
if (cd === 10) {
cd = "X";
}
if(cd === cdv)
{
if (cd === cdv) {
return true;
}
return false;
}, "The specified vehicle identification number (VIN) is invalid.");
$.validator.addMethod("zipcodeUS", function(value, element)
{
$.validator.addMethod("zipcodeUS", function (value, element) {
return this.optional(element) || /^\d{5}(-\d{4})?$/.test(value);
}, "The specified US ZIP Code is invalid");
$.validator.addMethod("ziprange", function(value, element)
{
$.validator.addMethod("ziprange", function (value, element) {
return this.optional(element) || /^90[2-5]\d\{2\}-\d{4}$/.test(value);
}, "Your ZIP-code must be in the range 902xx-xxxx to 905xx-xxxx");
return $;

File diff suppressed because it is too large Load Diff

View File

@@ -22,5 +22,5 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -20,5 +20,5 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |

View File

@@ -77,17 +77,17 @@ Windows: `Aaru media dump -f -p 0 --resume false \\.\PhysicalDrive3 mydisk.aaruf
## Operating system support
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------|----------|--------|--------|----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No¹ | Yes | Yes |
| Serial ATA | Yes | No¹ | Yes | Yes |
| USB | Partial⁴ | Partial⁵ | Yes | Yes |
| FireWire | Partial⁶ | Partial⁵ | Yes | Partial⁶ |
| PCMCIA | Partial⁷ | Partial⁵ | Yes | Partial⁷ |
| SecureDigital / MultiMediaCard | Not yet⁸ | No¹ | Yes | Untested⁹ |
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------------------------|----------|----------|-------|-----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No¹ | Yes | Yes |
| Serial ATA | Yes | No¹ | Yes | Yes |
| USB | Partial⁴ | Partial⁵ | Yes | Yes |
| FireWire | Partial⁶ | Partial⁵ | Yes | Partial⁶ |
| PCMCIA | Partial⁷ | Partial⁵ | Yes | Partial⁷ |
| SecureDigital / MultiMediaCard | Not yet⁸ | No¹ | Yes | Untested⁹ |
1. macOS only allows talking with MultiMedia devices.
2. Support for MultiMedia devices in macOS will be added if users require it

View File

@@ -31,17 +31,17 @@ Windows: `Aaru media info \\.\PhysicalDrive3`
## Operating system support
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------|----------|--------|--------|----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No³ | Yes³ | Yes³ |
| Serial ATA | Yes³ | No³ | Yes³ | Yes³ |
| USB | Partial | Partial | Yes | Yes |
| FireWire | Partial | Partial | Yes | Partial |
| PCMCIA | Partial | Partial | Yes | Partial |
| SecureDigital / MultiMediaCard | Not yet³ | No³ | Yes³ | Untested³ |
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------------------------|----------|----------|-------|-----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No³ | Yes³ | Yes³ |
| Serial ATA | Yes³ | No³ | Yes³ | Yes³ |
| USB | Partial | Partial | Yes | Yes |
| FireWire | Partial | Partial | Yes | Partial |
| PCMCIA | Partial | Partial | Yes | Partial |
| SecureDigital / MultiMediaCard | Not yet³ | No³ | Yes³ | Untested³ |
1. macOS only allows talking with MultiMedia devices.
2. Support for MultiMedia devices in macOS will be added if users require it

View File

@@ -33,17 +33,17 @@ Windows: `Aaru media scan \\.\PhysicalDrive3`
## Operating system support
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------|----------|--------|--------|----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No¹ | Yes | Yes |
| Serial ATA | Yes | No¹ | Yes | Yes |
| USB | Partial⁴ | Partial⁵ | Yes | Yes |
| FireWire | Partial⁶ | Partial⁵ | Yes | Partial⁶ |
| PCMCIA | Partial⁷ | Partial⁵ | Yes | Partial⁷ |
| SecureDigital / MultiMediaCard | Not yet⁸ | No¹ | Yes | Untested⁹ |
| Device Type | FreeBSD | MacOS | Linux | Windows |
|--------------------------------|----------|----------|-------|-----------|
| SCSI Block device | Yes | No¹ | Yes | Yes |
| SCSI MultiMedia device | Yes | Not yet² | Yes | Yes |
| SCSI Streaming device | Yes | No¹ | Yes | Yes |
| Parallel ATA | No³ | No¹ | Yes | Yes |
| Serial ATA | Yes | No¹ | Yes | Yes |
| USB | Partial⁴ | Partial⁵ | Yes | Yes |
| FireWire | Partial⁶ | Partial⁵ | Yes | Partial⁶ |
| PCMCIA | Partial⁷ | Partial⁵ | Yes | Partial⁷ |
| SecureDigital / MultiMediaCard | Not yet⁸ | No¹ | Yes | Untested⁹ |
1. macOS only allows talking with MultiMedia devices.
2. Support for MultiMedia devices in macOS will be added if users require it

View File

@@ -22,5 +22,5 @@ default false)*
## Operating system support
| FreeBSD | macOS | Linux | Windows |
| ------- | ----- | ----- | ------- |
|---------|-------|-------|---------|
| Yes | Yes | Yes | Yes |