github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

Browse source
This commit is contained in:
Henry Oswald 2015-09-14 15:28:34 +01:00
commit 5ffd76c670
5 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/views/project/editor/track-changes.jade
View file

@ -76,8 +76,8 @@ div#trackChanges(ng-show="ui.view == 'track-changes'")
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(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") You
.name(ng-if="update_user && update_user.id != user.id" ng-bind="displayName(update_user)")
.name(ng-if="update_user && update_user.id == user.id") You
.name(ng-if="update_user == null") #{translate("anonymous")}
div.user(ng-if="update.meta.users.length == 0")
.color-square(style="background-color: hsl(100, 100%, 50%)")

2
services/web/public/coffee/ide/track-changes/TrackChangesManager.coffee
View file

@ -250,5 +250,5 @@ define [
_updateContainsUserId: (update, user_id) ->
for user in update.meta.users
return true if user.id == user_id
return true if user?.id == user_id
return false

13
services/web/public/coffee/ide/track-changes/controllers/TrackChangesListController.coffee
View file

@ -103,4 +103,15 @@ define [
$scope.trackChanges.hoveringOverListSelectors = false
$scope.resetHoverState()
]
$scope.displayName = (user) ->
full_name = "#{user.first_name} #{user.last_name}"
fallback_name = "Unknown"
if !user?
fallback_name
else if full_name != " "
full_name
else if user.email
user.email
else
fallback_name
]

7
services/web/public/stylesheets/app/editor/track-changes.less
View file

@ -139,11 +139,14 @@
width: 12px;
border-radius: 3px;
position: absolute;
top: 3px;
left: 0;
bottom: 3px;
}
.name {
display: inline-block;
width: 94%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
}

2
services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee
View file

@ -369,5 +369,5 @@ describe "CompileController", ->
it "should return a 200 and body", ->
@res.send
.calledWith(200, {content:"body"})
.calledWith({content:"body"})
.should.equal true