Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel

services/web/public/coffee/ide/editor/directives/aceEditor.coffee

@@ -244,6 +244,8 @@ define [
 					scope.eventsBridge.emit "aceScrollbarVisibilityChanged", vRenderer.scrollBarV.isVisible, vRenderer.scrollBarV.width
 					
 				if scope.eventsBridge?
+					editor.renderer.on "scrollbarVisibilityChanged", onScrollbarVisibilityChanged
+
 					scope.eventsBridge.on "externalScroll", (position) ->
 						editor.getSession().setScrollTop(position)
 
@@ -297,9 +299,9 @@ define [
 					# need to set annotations after attaching because attaching
 					# deletes and then inserts document content
 					session.setAnnotations scope.annotations
-					
-					session.on "changeScrollTop", onScroll
-					editor.renderer.on "scrollbarVisibilityChanged", onScrollbarVisibilityChanged
+
+					if scope.eventsBridge?
+						session.on "changeScrollTop", onScroll
 
 					setTimeout () ->
 						# Let any listeners init themselves

services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee

@@ -19,10 +19,6 @@ define [
 			adding: false
 			content: ""
 
-		# DEPRECATED Used to communicate between Ace and reviewPanelSorted directive 
-		$scope.scrollBindings =
-			reviewPanelEvents: new EventEmitter()
-
 		$scope.reviewPanelEventsBridge = new EventEmitter()
 
 		changesTrackers = {}