From 8beb9a393d97210ab6d1dbb696e7996d91471a56 Mon Sep 17 00:00:00 2001
From: Dan Helfman <dan@luminotes.com>
Date: Mon, 16 Feb 2009 16:30:48 -0800
Subject: [PATCH] Fixed a bug in which clicking "compare versions" during a
 conflict didn't actually display the changes between the two versions.

---
 NEWS                | 2 ++
 static/js/Editor.js | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 4da9562..d8999d5 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@
      URL.
    * You can now copy the Luminotes Desktop URL and paste it into another
      web browser without getting an error message.
+ * Fixed a bug in which clicking "compare versions" during a conflict didn't
+   actually display the changes between the two versions.
 
 1.6.5: February 12, 2009
  * Now ignoring even more unneeded HTML tags from an MS Word copy-and-paste.
diff --git a/static/js/Editor.js b/static/js/Editor.js
index 19841af..d1172de 100644
--- a/static/js/Editor.js
+++ b/static/js/Editor.js
@@ -1584,10 +1584,13 @@ function normalize_title( title ) {
 }
 
 function editor_by_id( note_id, revision ) {
-  if ( revision )
+  if ( revision ) {
     var iframe = getElement( "note_" + note_id + " " + revision );
-  else
+    if ( !iframe && getElement( "note_" + note_id ) )
+      return null;
+  } else {
     var iframe = getElement( "note_" + note_id );
+  }
 
   if ( iframe )
     return iframe.editor;