witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

No longer popping up a link info box when clicking on a note link.

This commit is contained in:
Dan Helfman 2008-03-11 00:48:37 +00:00
parent cf00a491a7
commit c0cf5892be
3 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,3 +1,6 @@
1.2.8: March 10, 2008
* No longer popping up a link info box when clicking on a note link.
1.2.7: March 10, 2008
* Fixed a bug where, after you highlighted a link and clicked the link button
to unlink it, the link info box popped up.

79
static/js/Editor.js
View File

@ -317,7 +317,7 @@ Editor.prototype.key_released = function ( event ) {
this.cleanup_html();
signal( this, "state_changed", this );
signal( this, "state_changed", this, false );
}
Editor.prototype.cleanup_html = function () {
@ -348,50 +348,57 @@ Editor.prototype.cleanup_html = function () {
Editor.prototype.mouse_clicked = function ( event ) {
this.link_started = null;
var self = this;
// update the state no matter what, in case the cursor has moved
if ( this.edit_enabled )
signal( this, "state_changed", this );
function handle_click( event ) {
// we only want to deal with left mouse button clicks
if ( event.mouse().button.middle || event.mouse().button.right )
return false;
// we only want to deal with left mouse button clicks
if ( event.mouse().button.middle || event.mouse().button.right )
return;
// search through the tree of elements containing the clicked target. if a link isn't found, bail
var link = event.target()
while ( link.nodeName != "A" ) {
link = link.parentNode;
if ( !link )
return false;
}
if ( !link.href ) return false;
// search through the tree of elements containing the clicked target. if a link isn't found, bail
var link = event.target()
while ( link.nodeName != "A" ) {
link = link.parentNode;
if ( !link )
return;
}
if ( !link.href ) return;
// links with targets are considered to be external links pointing outside of this wiki
if ( link.target ) {
// if this is a read-only editor, bail and let the browser handle the link normally
if ( !self.edit_enabled ) return true;
// otherwise, this is a read-write editor, so we've got to launch the external link ourselves.
// note that this ignores what the link target actually contains and assumes it's "_new"
window.open( link.href );
event.stop();
return true;
}
// special case for links to uploaded files
if ( !link.target && /\/files\//.test( link.href ) ) {
if ( !/\/files\/new$/.test( link.href ) )
location.href = link.href;
return false;
}
// links with targets are considered to be external links pointing outside of this wiki
if ( link.target ) {
// if this is a read-only editor, bail and let the browser handle the link normally
if ( !this.edit_enabled ) return;
// otherwise, this is a read-write editor, so we've got to launch the external link ourselves.
// note that this ignores what the link target actually contains and assumes it's "_new"
window.open( link.href );
event.stop();
return;
// load the note corresponding to the clicked link
var query = parse_query( link );
var title = link_title( link, query );
var id = query.note_id;
signal( self, "load_editor", title, id, null, link, self.iframe );
return true;
}
// special case for links to uploaded files
if ( !link.target && /\/files\//.test( link.href ) ) {
if ( !/\/files\/new$/.test( link.href ) )
location.href = link.href;
return;
}
var link_clicked = handle_click( event );
event.stop();
// in case the cursor has moved, update the state
if ( this.edit_enabled )
signal( this, "state_changed", this, link_clicked );
// load the note corresponding to the clicked link
var query = parse_query( link );
var title = link_title( link, query );
var id = query.note_id;
signal( this, "load_editor", title, id, null, link, this.iframe );
}
Editor.prototype.scrape_title = function () {

6
static/js/Wiki.js
View File

@ -698,9 +698,11 @@ Wiki.prototype.resize_editors = function () {
}
}
Wiki.prototype.editor_state_changed = function ( editor ) {
Wiki.prototype.editor_state_changed = function ( editor, link_clicked ) {
this.update_toolbar();
this.display_link_pulldown( editor );
if ( !link_clicked )
this.display_link_pulldown( editor );
}
Wiki.prototype.editor_title_changed = function ( editor, old_title, new_title ) {