From 2853156a2bce535bcaa440c37cf872916f76c03b Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Thu, 3 Jan 2013 08:10:25 +0000 Subject: Refactoring, rename isNil to isNull. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428206 13f79535-47bb-0310-9956-ffa450edef68 --- .../trunk/hosting/server/htdocs/account/index.html | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'sca-cpp/trunk/hosting/server/htdocs/account') diff --git a/sca-cpp/trunk/hosting/server/htdocs/account/index.html b/sca-cpp/trunk/hosting/server/htdocs/account/index.html index 47c0ea0e9c..9357a89dd6 100644 --- a/sca-cpp/trunk/hosting/server/htdocs/account/index.html +++ b/sca-cpp/trunk/hosting/server/htdocs/account/index.html @@ -133,29 +133,29 @@ var savedpicxml = ''; var acct = cadr(assoc("'content", acctentry)); var email = assoc("'email", acct); - $('userEmail').value = isNil(email) || isNil(cdr(email))? '' : cadr(email); + $('userEmail').value = isNull(email) || isNull(cdr(email))? '' : cadr(email); var desc = assoc("'description", acct); - $('userDescription').innerHTML = isNil(desc) || isNil(cdr(desc))? '' : cadr(desc); + $('userDescription').innerHTML = isNull(desc) || isNull(cdr(desc))? '' : cadr(desc); /* TODO disabled for now var cal = assoc("'calendar", acct); reduce(function(i, evt) { var sched = assoc("'@schedule", evt); var svc = assoc("'@service", evt); - $('sched' + i).value = isNil(sched)? '' : cadr(sched); - $('service' + i).value = isNil(svc)? '' : cadr(svc); + $('sched' + i).value = isNull(sched)? '' : cadr(sched); + $('service' + i).value = isNull(svc)? '' : cadr(svc); return i + 1; - }, 1, isNil(cal)? mklist() : cadr(cadr(cal))); + }, 1, isNull(cal)? mklist() : cadr(cadr(cal))); var keys = assoc("'keys", acct); reduce(function(i, key) { var kn = assoc("'@name", key); var kv = assoc("'@value", key); - $('name' + i).value = isNil(kn)? '' : cadr(kn); - $('value' + i).value = isNil(kv)? '' : cadr(kv); + $('name' + i).value = isNull(kn)? '' : cadr(kn); + $('value' + i).value = isNull(kv)? '' : cadr(kv); return i + 1; - }, 1, isNil(keys)? mklist() : cadr(cadr(keys))); + }, 1, isNull(keys)? mklist() : cadr(cadr(keys))); */ savedacctxml = car(atom.writeATOMEntry(valuesToElements(mklist(acctentry)))); @@ -184,7 +184,7 @@ var savedpicxml = ''; var content = assoc("'content", picentry); var picture = assoc("'picture", content); var img = assoc("'image", picture); - if (!isNil(img)) + if (!isNull(img)) $('userPicture').src = cadr(img); onlinestatus(); @@ -216,11 +216,11 @@ function refreshpic() { var token = assoc("'token", picture); // Update picture - if (isNil(token)) { + if (isNull(token)) { var entryxml = car(atom.writeATOMEntry(valuesToElements(mklist(picentry)))); savedpicxml = entryxml; var img = assoc("'image", picture); - if (!isNil(img)) + if (!isNull(img)) $('userPicture').src = cadr(img); $('refreshingPicture').style.display = 'none'; refreshingpic = false; @@ -237,7 +237,7 @@ function refreshpic() { * Save the user's account. */ function saveacct(entryxml) { - if (isNil(username)) + if (isNull(username)) return false; workingstatus(true); showstatus('Saving'); @@ -261,7 +261,7 @@ function saveacct(entryxml) { * Save the user's picture. */ function savepic(entryxml) { - if (isNil(username)) + if (isNull(username)) return false; workingstatus(true); showstatus('Uploading'); -- cgit v1.2.3