Focus on box when adding a comment

This commit is contained in:
James Allen 2016-11-17 15:20:25 +00:00
parent 7c3a4dfa4d
commit 77400b000b
2 changed files with 13 additions and 11 deletions

View file

@ -271,14 +271,6 @@ define [
cursor_offset = @_aceRangeToShareJs(selection.start)
entries = @_getCurrentDocEntries()
for id, entry of entries
if entry.type == "comment"
entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.length)
else if entry.type == "insert"
entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.content.length)
else if entry.type == "delete"
entry.focused = (entry.offset == cursor_offset)
if selection.start.column == selection.end.column and selection.start.row == selection.end.row
# No selection
delete entries["add-comment"]
@ -288,6 +280,16 @@ define [
offset: cursor_offset
}
for id, entry of entries
if entry.type == "comment"
entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.length)
else if entry.type == "insert"
entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.content.length)
else if entry.type == "delete"
entry.focused = (entry.offset == cursor_offset)
else if entry.type == "add-comment" and !selection.isEmpty()
entry.focused = true
updateEntryGeneration: () ->
# Rather than making angular deep watch the whole entries array
@$scope.reviewPanel.entryGeneration ?= 0

View file

@ -65,7 +65,7 @@
display: flex;
flex-direction: column;
width: @review-panel-width;
overflow: hidden;
overflow: visible;
}
.rp-size-mini & {
display: block;
@ -178,8 +178,8 @@
width: auto;
&-focused {
left: 0px;
right: 10px;
left: -2px;
right: 12px;
z-index: 1;
}