Просмотр исходного кода

Init review panel with ace editor height

James Allen 10 лет назад
Родитель
Сommit
42ab2e8165

+ 6 - 2
services/web/public/coffee/ide/editor/directives/aceEditor.coffee

@@ -234,8 +234,6 @@ define [
 
 
 					doc = session.getDocument()
 					doc = session.getDocument()
 					doc.on "change", onChange
 					doc.on "change", onChange
-					
-					session.on "changeScrollTop", onScroll
 
 
 					sharejs_doc.on "remoteop.recordForUndo", () =>
 					sharejs_doc.on "remoteop.recordForUndo", () =>
 						undoManager.nextUpdateIsRemote = true
 						undoManager.nextUpdateIsRemote = true
@@ -243,9 +241,15 @@ define [
 					editor.initing = true
 					editor.initing = true
 					sharejs_doc.attachToAce(editor)
 					sharejs_doc.attachToAce(editor)
 					editor.initing = false
 					editor.initing = false
+
 					# need to set annotations after attaching because attaching
 					# need to set annotations after attaching because attaching
 					# deletes and then inserts document content
 					# deletes and then inserts document content
 					session.setAnnotations scope.annotations
 					session.setAnnotations scope.annotations
+					
+					session.on "changeScrollTop", onScroll
+					setTimeout () ->
+						# Let any listeners init themselves
+						onScroll(editor.renderer.getScrollTop())
 
 
 					editor.focus()
 					editor.focus()
 
 

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

@@ -45,4 +45,4 @@ define [
 			deltaY = e.wheelY
 			deltaY = e.wheelY
 			# console.log "mousewheel", deltaY
 			# console.log "mousewheel", deltaY
 			scroller.scrollTop(scroller.scrollTop() + deltaY * 4)
 			scroller.scrollTop(scroller.scrollTop() + deltaY * 4)
-			e.preventDefault()
+			e.preventDefault()