github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #447 from sharelatex/ja-track-changes-bug-fixes

Browse source 
Track changes bug fixes
This commit is contained in:
James Allen 2017-03-08 14:11:13 +00:00 committed by GitHub
commit 111c6ab281
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/views/project/editor/review-panel.pug
View file

@ -340,10 +340,10 @@ script(type='text/ng-template', id='addCommentEntryTemplate')
ng-keypress="handleCommentKeyPress($event);" ng-keypress="handleCommentKeyPress($event);"
placeholder=translate("add_your_comment_here") placeholder=translate("add_your_comment_here")
focus-on="comment:new:open" focus-on="comment:new:open"
ng-blur="submitNewComment()" ng-blur="submitNewComment($event)"
) )
.rp-entry-actions .rp-entry-actions
button.rp-entry-button( button.rp-entry-button.rp-entry-button-cancel(
ng-click="cancelNewComment();" ng-click="cancelNewComment();"
) )
i.fa.fa-times i.fa.fa-times

5
services/web/public/coffee/ide/review-panel/directives/addCommentEntry.coffee
View file

@ -31,7 +31,10 @@ define [
if scope.state.content.length > 0 if scope.state.content.length > 0
scope.submitNewComment() scope.submitNewComment()
scope.submitNewComment = () -> scope.submitNewComment = (event) ->
# If this is from a blur event from clicking on cancel, ignore it.
if event? and event.type == "blur" and $(event.relatedTarget).hasClass("rp-entry-button-cancel")
return true
scope.onSubmit { content: scope.state.content } scope.onSubmit { content: scope.state.content }
scope.state.isAdding = false scope.state.isAdding = false
scope.state.content = "" scope.state.content = ""

6
services/web/public/stylesheets/app/editor/review-panel.less
View file

@ -117,6 +117,12 @@
z-index: 6; z-index: 6;
} }
.loading-panel {
.rp-size-expanded & {
right: @review-panel-width;
}
}
.review-panel-toolbar { .review-panel-toolbar {
display: none; display: none;
.rp-size-expanded & { .rp-size-expanded & {