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:
parent
42cff5421c
commit
8beb9a393d
2
NEWS
2
NEWS
|
@ -9,6 +9,8 @@
|
||||||
URL.
|
URL.
|
||||||
* You can now copy the Luminotes Desktop URL and paste it into another
|
* You can now copy the Luminotes Desktop URL and paste it into another
|
||||||
web browser without getting an error message.
|
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
|
1.6.5: February 12, 2009
|
||||||
* Now ignoring even more unneeded HTML tags from an MS Word copy-and-paste.
|
* Now ignoring even more unneeded HTML tags from an MS Word copy-and-paste.
|
||||||
|
|
|
@ -1584,10 +1584,13 @@ function normalize_title( title ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function editor_by_id( note_id, revision ) {
|
function editor_by_id( note_id, revision ) {
|
||||||
if ( revision )
|
if ( revision ) {
|
||||||
var iframe = getElement( "note_" + note_id + " " + revision );
|
var iframe = getElement( "note_" + note_id + " " + revision );
|
||||||
else
|
if ( !iframe && getElement( "note_" + note_id ) )
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
var iframe = getElement( "note_" + note_id );
|
var iframe = getElement( "note_" + note_id );
|
||||||
|
}
|
||||||
|
|
||||||
if ( iframe )
|
if ( iframe )
|
||||||
return iframe.editor;
|
return iframe.editor;
|
||||||
|
|
Reference in New Issue