mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
Fix up a bunch of issues with the track-changes list view.
- not crash when a user is null - fix alignment of user color square - if first and last name are absent, display email instead - truncate overly long display name with '...'
This commit is contained in:
parent
778f588741
commit
7bc9218b3c
4 changed files with 16 additions and 5 deletions
|
@ -76,7 +76,7 @@ div#trackChanges(ng-show="ui.view == 'track-changes'")
|
||||||
div.user(ng-repeat="update_user in update.meta.users")
|
div.user(ng-repeat="update_user in update.meta.users")
|
||||||
.color-square(ng-if="update_user != null", ng-style="{'background-color': 'hsl({{ update_user.hue }}, 70%, 50%)'}")
|
.color-square(ng-if="update_user != null", ng-style="{'background-color': 'hsl({{ update_user.hue }}, 70%, 50%)'}")
|
||||||
.color-square(ng-if="update_user == null", ng-style="{'background-color': 'hsl(100, 70%, 50%)'}")
|
.color-square(ng-if="update_user == null", ng-style="{'background-color': 'hsl(100, 70%, 50%)'}")
|
||||||
.name(ng-if="update_user.id != user.id") {{update_user.first_name}} {{update_user.last_name}}
|
.name(ng-if="update_user.id != user.id" ng-bind="displayName(update_user)")
|
||||||
.name(ng-if="update_user.id == user.id") You
|
.name(ng-if="update_user.id == user.id") You
|
||||||
.name(ng-if="update_user == null") #{translate("anonymous")}
|
.name(ng-if="update_user == null") #{translate("anonymous")}
|
||||||
div.user(ng-if="update.meta.users.length == 0")
|
div.user(ng-if="update.meta.users.length == 0")
|
||||||
|
|
|
@ -250,5 +250,5 @@ define [
|
||||||
|
|
||||||
_updateContainsUserId: (update, user_id) ->
|
_updateContainsUserId: (update, user_id) ->
|
||||||
for user in update.meta.users
|
for user in update.meta.users
|
||||||
return true if user.id == user_id
|
return true if user?.id == user_id
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -103,4 +103,12 @@ define [
|
||||||
$scope.trackChanges.hoveringOverListSelectors = false
|
$scope.trackChanges.hoveringOverListSelectors = false
|
||||||
$scope.resetHoverState()
|
$scope.resetHoverState()
|
||||||
|
|
||||||
]
|
$scope.displayName = (user) ->
|
||||||
|
full_name = "#{user.first_name} #{user.last_name}"
|
||||||
|
if full_name != " "
|
||||||
|
full_name
|
||||||
|
else if user.email
|
||||||
|
user.email
|
||||||
|
else
|
||||||
|
"Unknown"
|
||||||
|
]
|
||||||
|
|
|
@ -139,11 +139,14 @@
|
||||||
width: 12px;
|
width: 12px;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 3px;
|
|
||||||
left: 0;
|
left: 0;
|
||||||
|
bottom: 3px;
|
||||||
}
|
}
|
||||||
.name {
|
.name {
|
||||||
display: inline-block;
|
width: 94%;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue