Mercurial > summit-idp
changeset 55:0a9c62c25938
Added Attendees.currentUser, replaced Attendees.value with Attendees.all.
author | Atul Varma <avarma@mozilla.com> |
---|---|
date | Sun, 27 Jun 2010 11:21:52 -0700 |
parents | fe5a2f26787d |
children | bd71f612d3b1 |
files | static-files/index.js static-files/server.js static-files/summit-idp.js |
diffstat | 3 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/static-files/index.js Sat Jun 26 21:33:22 2010 -0700 +++ b/static-files/index.js Sun Jun 27 11:21:52 2010 -0700 @@ -28,7 +28,7 @@ } function fillUserInfo() { - var userInfo = Attendees.value[Config.value.userID]; + var userInfo = Attendees.currentUser; if (!userInfo) userInfo = {}; normalizeUserInfo(userInfo); @@ -48,8 +48,8 @@ // Build list of all attendees. var everyone = $("#everyone-info .attendees"); everyone.empty(); - for (userID in Attendees.value) { - var person = Attendees.value[userID]; + for (userID in Attendees.all) { + var person = Attendees.all[userID]; normalizeUserInfo(person); var elem = $("#templates .attendee").clone();
--- a/static-files/server.js Sat Jun 26 21:33:22 2010 -0700 +++ b/static-files/server.js Sun Jun 27 11:21:52 2010 -0700 @@ -26,8 +26,8 @@ return; } - if (Attendees.value) { - cb({users: Attendees.value}); + if (Attendees.all) { + cb({users: Attendees.all}); } else attendeeCallbacks.push(cb); } @@ -39,7 +39,7 @@ function() { var cbs = attendeeCallbacks; attendeeCallbacks = []; - cbs.forEach(function(cb) { cb({users: Attendees.value}); }); + cbs.forEach(function(cb) { cb({users: Attendees.all}); }); }); } )(window);
--- a/static-files/summit-idp.js Sat Jun 26 21:33:22 2010 -0700 +++ b/static-files/summit-idp.js Sun Jun 27 11:21:52 2010 -0700 @@ -168,7 +168,8 @@ function(success, data) { req = null; if (success) { - self.value = data.contents; + self.all = data.contents; + self.currentUser = self.all[Config.value.userID]; self.observers.forEach(function(cb) { cb(); }); } else { // TODO: Raise an error? @@ -176,12 +177,13 @@ }); } }, - value: null, + currentUser: null, + all: null, observers: [] }; function refreshAttendees() { - if (Config.value.state == "logged-in" && !Attendees.users) + if (Config.value.state == "logged-in" && !Attendees.all) Attendees.refresh(); }