witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Fixed a bug in which renaming a link title and then pressing ctrl-L would replace the link destination.

This commit is contained in:
Dan Helfman 2008-08-01 15:50:49 -07:00
parent 9fed61aae1
commit b7e07fbc72
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,6 +1,8 @@
1.4.22:
1.4.22: August 1, 2008:
* Skipping clearing of messages/errors if they haven't been open long enough
to read.
* Fixed a bug in which renaming a link title and then pressing ctrl-L would
replace the link destination.
1.4.21: July 30, 2008:
* Fixed bug in IE 7 in which there was too much horizontal spacing at very

11
static/js/Wiki.js
View File

@ -554,7 +554,7 @@ Wiki.prototype.load_editor = function ( note_title, note_id, revision, previous_
);
}
Wiki.prototype.resolve_link = function ( note_title, link, callback ) {
Wiki.prototype.resolve_link = function ( note_title, link, force, callback ) {
// if the title looks like a URL, then make it a link to an external site
if ( /^\w+:\/\//.test( note_title ) )
var title_looks_like_url = true;
@ -583,8 +583,11 @@ Wiki.prototype.resolve_link = function ( note_title, link, callback ) {
var id = parse_query( link ).note_id;
// if the link already has a valid-looking id, it's already resolved, so bail
if ( !callback && id != undefined && id != "new" && id != "null" )
if ( !force && id != undefined && id != "new" && id != "null" ) {
if ( callback )
callback( null );
return;
}
if ( note_title.length == 0 )
return;
@ -1248,7 +1251,7 @@ Wiki.prototype.toggle_link_button = function ( event ) {
if ( link && link.parentNode != null ) {
var self = this;
this.resolve_link( link_title( link ), link, function ( summary ) {
this.resolve_link( link_title( link ), link, false, function ( summary ) {
self.display_link_pulldown( self.focused_editor, link );
} );
} else {
@ -3024,7 +3027,7 @@ Link_pulldown.prototype.title_field_changed = function ( event, note ) {
this.display_summary( note.title, summarize_html( note.contents, note.title ) );
// otherwise, try to resolve the link title
} else {
this.wiki.resolve_link( title, this.link, function ( summary ) {
this.wiki.resolve_link( title, this.link, true, function ( summary ) {
self.display_summary( title, summary );
} );
}