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

2014-07-28 16:52:40 +01:00
parent 9354d61aa3 9db2fc93a4
commit e8be248b29
2 changed files with 3 additions and 2 deletions
@@ -21,7 +21,7 @@ define [
 				highlight.row, highlight.column,
 				highlight.row, highlight.column + highlight.word.length
 			)
-			highlight.markerId = @editor.getSession().addMarker range, "spelling-highlight"
+			highlight.markerId = @editor.getSession().addMarker range, "spelling-highlight", null, true
 			@highlights.rows[highlight.row] ||= []
 			@highlights.rows[highlight.row].push highlight

@@ -29,7 +29,8 @@ define [
 				@openContextMenu(e.domEvent)

 			$(document).on "click", (e) =>
-				@closeContextMenu(e)
+				if e.which != 3 # Ignore if this was a right click
+					@closeContextMenu(e)
 				return true

 			@$scope.replaceWord = (highlight, suggestion) =>