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

support jumping to position with line and column from log entries

Brian Gough 10 лет назад
Родитель
Сommit
a3c8202d0e

+ 1 - 1
services/web/public/coffee/ide/editor/EditorManager.coffee

@@ -46,7 +46,7 @@ define [
 
 
 			done = () =>
 			done = () =>
 				if options.gotoLine?
 				if options.gotoLine?
-					@$scope.$broadcast "editor:gotoLine", options.gotoLine
+					@$scope.$broadcast "editor:gotoLine", options.gotoLine, options.gotoColumn
 			
 			
 			if doc.id == @$scope.editor.open_doc_id and !options.forceReopen
 			if doc.id == @$scope.editor.open_doc_id and !options.forceReopen
 				@$scope.$apply () =>
 				@$scope.$apply () =>

+ 6 - 6
services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee

@@ -23,10 +23,10 @@ define [], () ->
 				@storeCursorPosition(@editor.getSession())
 				@storeCursorPosition(@editor.getSession())
 				@storeScrollTopPosition(@editor.getSession())
 				@storeScrollTopPosition(@editor.getSession())
 
 
-			@$scope.$on "#{@$scope.name}:gotoLine", (editor, value) =>
-				if value?
+			@$scope.$on "#{@$scope.name}:gotoLine", (editor, line, column) =>
+				if line?
 					setTimeout () =>
 					setTimeout () =>
-						@gotoLine(value)
+						@gotoLine(line, column)
 					, 10 # Hack: Must happen after @gotoStoredPosition
 					, 10 # Hack: Must happen after @gotoStoredPosition
 
 
 		storeScrollTopPosition: (session) ->
 		storeScrollTopPosition: (session) ->
@@ -53,6 +53,6 @@ define [], () ->
 			@editor.getSession().setScrollTop(pos.scrollTop or 0)
 			@editor.getSession().setScrollTop(pos.scrollTop or 0)
 			delete @ignoreCursorPositionChanges
 			delete @ignoreCursorPositionChanges
 
 
-		gotoLine: (line) ->
-			@editor.gotoLine(line)
-			@editor.focus()
+		gotoLine: (line, column) ->
+			@editor.gotoLine(line, column)
+			@editor.focus()

+ 3 - 1
services/web/public/coffee/ide/pdf/controllers/PdfController.coffee

@@ -556,7 +556,9 @@ define [
 			return if !entity? or entity.type != "doc"
 			return if !entity? or entity.type != "doc"
 			if entry.line?
 			if entry.line?
 				line = entry.line
 				line = entry.line
-			ide.editorManager.openDoc(entity, gotoLine: line)
+			if entry.column?
+				column = entry.column
+			ide.editorManager.openDoc(entity, gotoLine: line, gotoColumn: column)
 	]
 	]
 
 
 	App.controller 'ClearCacheModalController', ["$scope", "$modalInstance", ($scope, $modalInstance) ->
 	App.controller 'ClearCacheModalController', ["$scope", "$modalInstance", ($scope, $modalInstance) ->