From 0384f025dd6915d2d9771e37983dc839e49b28f7 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Fri, 20 Jul 2012 16:40:04 -0700
Subject: [PATCH] Add Buffer.isInConflict()

---
 src/app/buffer.coffee | 3 +++
 src/app/editor.coffee | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/buffer.coffee b/src/app/buffer.coffee
index 3ee768bd6..243b831a9 100644
--- a/src/app/buffer.coffee
+++ b/src/app/buffer.coffee
@@ -224,6 +224,9 @@ class Buffer
     @setPath(path)
     @trigger 'after-save'
 
+  isInConflict: ->
+    @isModified() and @isModifiedOnDisk()
+
   isModifiedOnDisk: ->
     @modifiedOnDisk
 
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 397de5591..1e6bad3a2 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -386,11 +386,11 @@ class Editor extends View
 
     @activeEditSession = @editSessions[index]
 
-    if @activeEditSession.buffer.isModifiedOnDisk() and @activeEditSession.buffer.isModified()
-      @alertEditSessionChangedOnDisk(@activeEditSession)
+    if @activeEditSession.buffer.isInConflict()
+      @showBufferConflictAlert(@activeEditSession)
 
     @activeEditSession.on "buffer-contents-change-on-disk", =>
-      @alertEditSessionChangedOnDisk(@activeEditSession)
+      @showBufferConflictAlert(@activeEditSession)
 
     @activeEditSession.on "buffer-path-change", =>
       @trigger 'editor-path-change'
@@ -398,7 +398,7 @@ class Editor extends View
     @trigger 'editor-path-change'
     @renderWhenAttached()
 
-  alertEditSessionChangedOnDisk: (editSession) ->
+  showBufferConflictAlert: (editSession) ->
     message = editSession.getPath()
     detailedMessage = "Has changed on disk. Do you want to reload it?"
     Native.alert message, detailedMessage, [