Skip to content
Browse files

Change "displayname" to "displayName"

  • Loading branch information...
1 parent be0ea6b commit 51c705a2db17992ad40d3973ec70f0359ea2ef8c @pthulin pthulin committed Mar 31, 2012
Showing with 12 additions and 12 deletions.
  1. +1 −1 model.py
  2. +1 −1 scripts/Menu.js
  3. +1 −1 scripts/Playlist.js
  4. +3 −3 scripts/User.js
  5. +6 −6 scripts/UserManager.js
View
2 model.py
@@ -160,7 +160,7 @@ def get_youtify_user_struct(youtify_user_model, include_private_data=False, incl
user = {
'id': str(youtify_user_model.key().id()),
'email': None,
- 'displayname': get_display_name_for_youtify_user_model(youtify_user_model),
+ 'displayName': get_display_name_for_youtify_user_model(youtify_user_model),
'nickname': youtify_user_model.nickname,
'firstName': youtify_user_model.first_name,
'lastName': youtify_user_model.last_name,
View
2 scripts/Menu.js
@@ -231,7 +231,7 @@ function MenuItem(type) {
var $user = $('<span class="user"></span>');
$('<img />').attr('src', user.smallImageUrl).appendTo($user);
- $('<span class="name"></span>').text(user.displayname).appendTo($user);
+ $('<span class="name"></span>').text(user.displayName).appendTo($user);
$user.click(function() {
history.pushState(null, null, '/users/' + user.id);
View
2 scripts/Playlist.js
@@ -118,7 +118,7 @@ function updatePlaylistBar(playlist) {
history.pushState(null, null, '/users/' + playlist.owner.id);
Menu.deSelectAll();
UserManager.loadProfile(playlist.owner.id);
- }).text(playlist.owner.displayname).show();
+ }).text(playlist.owner.displayName).show();
// Add save button if not already saved
if (!playlistManager.getPlaylistsMap().hasOwnProperty(playlist.remoteId)) {
View
6 scripts/User.js
@@ -2,7 +2,7 @@ function User(args) {
var self = this;
self.id = args.id;
self.nickname = args.nickname;
- self.displayname = args.displayname;
+ self.displayName = args.displayName;
self.email = args.email || '';
self.largeImageUrl = args.largeImageUrl || null;
self.smallImageUrl = args.smallImageUrl || null;
@@ -43,7 +43,7 @@ function User(args) {
self.addFollower = function(userId, userDisplayName, smallImageUrl) {
self.followers.push({
id: userId,
- displayname: userDisplayName,
+ displayName: userDisplayName,
smallImageUrl: smallImageUrl
});
};
@@ -71,7 +71,7 @@ function User(args) {
self.addFollowing = function(userId, userDisplayName, smallImageUrl) {
self.followings.push({
id: userId,
- displayname: userDisplayName,
+ displayName: userDisplayName,
smallImageUrl: smallImageUrl
});
};
View
12 scripts/UserManager.js
@@ -90,8 +90,8 @@ var UserManager = {
$followButton.hide();
$unFollowButton.show();
- user.addFollower(UserManager.currentUser.id, UserManager.currentUser.displayname, UserManager.currentUser.smallImageUrl);
- UserManager.currentUser.addFollowing(user.id, user.displayname, UserManager.currentUser.smallImageUrl);
+ user.addFollower(UserManager.currentUser.id, UserManager.currentUser.displayName, UserManager.currentUser.smallImageUrl);
+ UserManager.currentUser.addFollowing(user.id, user.displayName, UserManager.currentUser.smallImageUrl);
updateFollowersView();
});
});
@@ -105,8 +105,8 @@ var UserManager = {
$followButton.show();
$unFollowButton.hide();
- user.removeFollower(UserManager.currentUser.id, UserManager.currentUser.displayname);
- UserManager.currentUser.removeFollowing(user.id, user.displayname);
+ user.removeFollower(UserManager.currentUser.id, UserManager.currentUser.displayName);
+ UserManager.currentUser.removeFollowing(user.id, user.displayName);
updateFollowersView();
}
}
@@ -258,15 +258,15 @@ var UserManager = {
$followings.html('');
$followingsTab.text('Following (' + user.followings.length + ')');
$.each(user.followings, function(i, item) {
- $followings.append(createListElem(item.id, item.displayname, item.smallImageUrl));
+ $followings.append(createListElem(item.id, item.displayName, item.smallImageUrl));
});
}
function updateFollowersView() {
$followers.html('');
$followersTab.text('Followers (' + user.followers.length + ')');
$.each(user.followers, function(i, item) {
- $followers.append(createListElem(item.id, item.displayname, item.smallImageUrl));
+ $followers.append(createListElem(item.id, item.displayName, item.smallImageUrl));
});
}

0 comments on commit 51c705a

Please sign in to comment.
Something went wrong with that request. Please try again.