Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing.
This commit is contained in:
Colin Kuskie
commit
385931aaab
92 changed files with 1966 additions and 650 deletions
|
|
@ -1,155 +0,0 @@
|
|||
function emailCheck (emailStr) {
|
||||
|
||||
/* The following variable tells the rest of the function whether or not
|
||||
to verify that the address ends in a two-letter country or well-known
|
||||
TLD. 1 means check it, 0 means don't. */
|
||||
|
||||
var checkTLD=1;
|
||||
|
||||
/* The following is the list of known TLDs that an e-mail address must end with. */
|
||||
|
||||
var knownDomsPat=/^(com|net|org|edu|int|mil|gov|arpa|biz|aero|name|coop|info|pro|museum)$/i;
|
||||
|
||||
/* The following pattern is used to check if the entered e-mail address
|
||||
fits the user@domain format. It also is used to separate the username
|
||||
from the domain. */
|
||||
|
||||
var emailPat=/^(.+)@(.+)$/;
|
||||
|
||||
/* The following string represents the pattern for matching all special
|
||||
characters. We don't want to allow special characters in the address.
|
||||
These characters include ( ) < > @ , ; : \ " . [ ] */
|
||||
|
||||
var specialChars="\\(\\)><@,;:\\\\\\\"\\.\\[\\]";
|
||||
|
||||
/* The following string represents the range of characters allowed in a
|
||||
username or domainname. It really states which chars aren't allowed.*/
|
||||
|
||||
var validChars="\[^\\s" + specialChars + "\]";
|
||||
|
||||
/* The following pattern applies if the "user" is a quoted string (in
|
||||
which case, there are no rules about which characters are allowed
|
||||
and which aren't; anything goes). E.g. "jiminy cricket"@disney.com
|
||||
is a legal e-mail address. */
|
||||
|
||||
var quotedUser="(\"[^\"]*\")";
|
||||
|
||||
/* The following pattern applies for domains that are IP addresses,
|
||||
rather than symbolic names. E.g. joe@[123.124.233.4] is a legal
|
||||
e-mail address. NOTE: The square brackets are required. */
|
||||
|
||||
var ipDomainPat=/^\[(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\]$/;
|
||||
|
||||
/* The following string represents an atom (basically a series of non-special characters.) */
|
||||
|
||||
var atom=validChars + '+';
|
||||
|
||||
/* The following string represents one word in the typical username.
|
||||
For example, in john.doe@somewhere.com, john and doe are words.
|
||||
Basically, a word is either an atom or quoted string. */
|
||||
|
||||
var word="(" + atom + "|" + quotedUser + ")";
|
||||
|
||||
// The following pattern describes the structure of the user
|
||||
|
||||
var userPat=new RegExp("^" + word + "(\\." + word + ")*$");
|
||||
|
||||
/* The following pattern describes the structure of a normal symbolic
|
||||
domain, as opposed to ipDomainPat, shown above. */
|
||||
|
||||
var domainPat=new RegExp("^" + atom + "(\\." + atom +")*$");
|
||||
|
||||
/* Finally, let's start trying to figure out if the supplied address is valid. */
|
||||
|
||||
/* Begin with the coarse pattern to simply break up user@domain into
|
||||
different pieces that are easy to analyze. */
|
||||
|
||||
var matchArray=emailStr.match(emailPat);
|
||||
|
||||
if (matchArray==null) {
|
||||
|
||||
/* Too many/few @'s or something; basically, this address doesn't
|
||||
even fit the general mould of a valid e-mail address. */
|
||||
|
||||
alert("Email address seems incorrect (check @ and .'s)");
|
||||
return false;
|
||||
}
|
||||
var user=matchArray[1];
|
||||
var domain=matchArray[2];
|
||||
|
||||
// Start by checking that only basic ASCII characters are in the strings (0-127).
|
||||
|
||||
for (i=0; i<user.length; i++) {
|
||||
if (user.charCodeAt(i)>127) {
|
||||
alert("Ths username contains invalid characters.");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
for (i=0; i<domain.length; i++) {
|
||||
if (domain.charCodeAt(i)>127) {
|
||||
alert("Ths domain name contains invalid characters.");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// See if "user" is valid
|
||||
|
||||
if (user.match(userPat)==null) {
|
||||
|
||||
// user is not valid
|
||||
|
||||
alert("The username doesn't seem to be valid.");
|
||||
return false;
|
||||
}
|
||||
|
||||
/* if the e-mail address is at an IP address (as opposed to a symbolic
|
||||
host name) make sure the IP address is valid. */
|
||||
|
||||
var IPArray=domain.match(ipDomainPat);
|
||||
if (IPArray!=null) {
|
||||
|
||||
// this is an IP address
|
||||
|
||||
for (var i=1;i<=4;i++) {
|
||||
if (IPArray[i]>255) {
|
||||
alert("Destination IP address is invalid!");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// Domain is symbolic name. Check if it's valid.
|
||||
|
||||
var atomPat=new RegExp("^" + atom + "$");
|
||||
var domArr=domain.split(".");
|
||||
var len=domArr.length;
|
||||
for (i=0;i<len;i++) {
|
||||
if (domArr[i].search(atomPat)==-1) {
|
||||
alert("The domain name does not seem to be valid.");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/* domain name seems valid, but now make sure that it ends in a
|
||||
known top-level domain (like com, edu, gov) or a two-letter word,
|
||||
representing country (uk, nl), and that there's a hostname preceding
|
||||
the domain or country. */
|
||||
|
||||
if (checkTLD && domArr[domArr.length-1].length!=2 &&
|
||||
domArr[domArr.length-1].search(knownDomsPat)==-1) {
|
||||
alert("The address must end in a well-known domain or two letter " + "country.");
|
||||
return false;
|
||||
}
|
||||
|
||||
// Make sure there's a host name preceding the domain.
|
||||
|
||||
if (len<2) {
|
||||
alert("This address is missing a hostname!");
|
||||
return false;
|
||||
}
|
||||
|
||||
// If we've gotten this far, everything's valid!
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
function fillIn(dom, a) {
|
||||
_.each(a, function (v, k) {
|
||||
if (dom[k]) {
|
||||
dom[k].value = v;
|
||||
dom[k].value = v || '';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -60,7 +60,8 @@
|
|||
calculateSummary: function () {
|
||||
var e = this.elements,
|
||||
prices = this.prices,
|
||||
shipping = prices.shipping[e.shipper.value],
|
||||
shipper = e.shipper,
|
||||
shipping = shipper && prices.shipping[shipper.value],
|
||||
shipPrice = (shipping ?
|
||||
(shipping.hasPrice ?
|
||||
parseFloat(shipping.price) :
|
||||
|
|
@ -138,7 +139,7 @@
|
|||
return function () {
|
||||
var address = {},
|
||||
label = e.label.value,
|
||||
copy = o && o.label.value === label,
|
||||
copy = o.label && o.label.value === label,
|
||||
cache = c[label],
|
||||
dirty;
|
||||
|
||||
|
|
@ -147,7 +148,7 @@
|
|||
}
|
||||
|
||||
_.each(e, function (v, k) {
|
||||
v = v.value;
|
||||
v = v.value || '';
|
||||
address[k] = v;
|
||||
if (cache[k] !== v) {
|
||||
dirty = true;
|
||||
|
|
@ -306,7 +307,7 @@
|
|||
|
||||
if (!opt) {
|
||||
opt = document.createElement('option');
|
||||
opt.text = label;
|
||||
opt.innerHTML = label;
|
||||
dropdown.appendChild(opt);
|
||||
}
|
||||
|
||||
|
|
@ -314,14 +315,16 @@
|
|||
}
|
||||
|
||||
updateOne(d.billing);
|
||||
updateOne(d.shipping);
|
||||
if (d.shipping) {
|
||||
updateOne(d.shipping);
|
||||
if (name === 'billing' && self.sameShipping()) {
|
||||
self.copyBilling();
|
||||
}
|
||||
else {
|
||||
self.computePerItemShippingOptions();
|
||||
}
|
||||
}
|
||||
d[name].value = id;
|
||||
if (name === 'billing' && self.sameShipping()) {
|
||||
self.copyBilling();
|
||||
}
|
||||
else {
|
||||
self.computePerItemShippingOptions();
|
||||
}
|
||||
self.updateSummary();
|
||||
});
|
||||
},
|
||||
|
|
@ -335,10 +338,9 @@
|
|||
e = this.elements,
|
||||
tax = e.tax,
|
||||
shipper = e.shipper,
|
||||
selected = shipper.value,
|
||||
d = e.dropdowns,
|
||||
shipping = d.shipping.value,
|
||||
billing = d.billing.value,
|
||||
selected, shipping,
|
||||
params = {
|
||||
shop: 'cart',
|
||||
method: 'ajaxPrices'
|
||||
|
|
@ -348,10 +350,14 @@
|
|||
params.billingId = billing;
|
||||
}
|
||||
|
||||
if (this.sameShipping()) {
|
||||
params.shippingId = params.billingId;
|
||||
} else if (addressIdCounts(shipping)) {
|
||||
params.shippingId = shipping;
|
||||
if (shipper) {
|
||||
selected = shipper.value; // save so we can restore later
|
||||
shipping = d.shipping.value;
|
||||
if (this.sameShipping()) {
|
||||
params.shippingId = params.billingId;
|
||||
} else if (addressIdCounts(shipping)) {
|
||||
params.shippingId = shipping;
|
||||
}
|
||||
}
|
||||
|
||||
this.request('GET', params, function (o) {
|
||||
|
|
@ -360,30 +366,32 @@
|
|||
if (response.error) {
|
||||
return;
|
||||
}
|
||||
if (shipper) {
|
||||
// We need to repopulate the shipper options dropdown
|
||||
// (but only if we have a shipper at all)
|
||||
_(shipper.options).chain().select(function (o) {
|
||||
return o.value;
|
||||
}).each(function (o) {
|
||||
o.parentNode.removeChild(o);
|
||||
});
|
||||
|
||||
_.each(response.shipping, function (o, id) {
|
||||
var opt = document.createElement('option'),
|
||||
label = o.label;
|
||||
|
||||
if (o.hasPrice) {
|
||||
label += ' (' + formatCurrency(o.price) + ')';
|
||||
}
|
||||
|
||||
opt.innerHTML = label;
|
||||
opt.value = id;
|
||||
shipper.appendChild(opt);
|
||||
});
|
||||
|
||||
shipper.value = selected;
|
||||
}
|
||||
self.prices = response;
|
||||
tax.innerHTML = formatCurrency(response.tax);
|
||||
|
||||
_(shipper.options).chain().select(function (o) {
|
||||
return o.value;
|
||||
}).each(function (o) {
|
||||
o.parentNode.removeChild(o);
|
||||
});
|
||||
|
||||
_.each(response.shipping, function (o, id) {
|
||||
var opt = document.createElement('option'),
|
||||
label = o.label;
|
||||
|
||||
if (o.hasPrice) {
|
||||
label += ' (' + formatCurrency(o.price) + ')';
|
||||
}
|
||||
|
||||
opt.innerHTML = label;
|
||||
opt.value = id;
|
||||
shipper.appendChild(opt);
|
||||
});
|
||||
|
||||
shipper.value = selected;
|
||||
self.calculateSummary();
|
||||
});
|
||||
},
|
||||
|
|
@ -405,7 +413,8 @@
|
|||
},
|
||||
|
||||
sameShipping: function () {
|
||||
return this.elements.same.checked;
|
||||
var same = this.elements.same;
|
||||
return same && same.checked;
|
||||
},
|
||||
|
||||
setCartItemShippingId: function (select) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue