witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Fixed a bug in which clicking "compare versions" during a conflict didn't actually display the changes between the two versions.

This commit is contained in:
Dan Helfman 2009-02-16 16:30:48 -08:00
parent 42cff5421c
commit 8beb9a393d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -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.

7
static/js/Editor.js
View File

@ -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;