github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 06:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Show "buffer in conflict" alert after edit session is visible

Browse Source
This commit is contained in:
Corey Johnson
2012-07-26 13:32:26 -07:00
parent 79893d96b6
commit 960bd1ea70
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/editor.coffee
View File

@@ -386,9 +386,6 @@ class Editor extends View
@activeEditSession = @editSessions[index]
if @activeEditSession.buffer.isInConflict()
@showBufferConflictAlert(@activeEditSession)
@activeEditSession.on "buffer-contents-change-on-disk", =>
@showBufferConflictAlert(@activeEditSession)
@@ -398,6 +395,9 @@ class Editor extends View
@trigger 'editor-path-change'
@renderWhenAttached()
if @attached and @activeEditSession.buffer.isInConflict()
@showBufferConflictAlert(@activeEditSession)
showBufferConflictAlert: (editSession) ->
message = editSession.getPath()
detailedMessage = "Has changed on disk. Do you want to reload it?"