witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Using "link.innerHTML =" instead of replaceChildNodes() to set a file link's 

title when uploading a file, as this plays more nicely with IE. With
replaceChildNodes(), IE swallows the text cursor and won't give it back.

Also explicitly passing link parameter to Upload_pulldown() constructor, as
editor.find_link_at_cursor() wasn't always working in IE.
This commit is contained in:
Dan Helfman 2008-02-22 23:03:10 +00:00
parent 36b11805c6
commit e7c96cadf5
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controller/Files.py
View File

@ -167,7 +167,6 @@ class FieldStorage( cherrypy._cpcgifs.FieldStorage ):
# file size is the entire content length of the POST, minus the size of the other form
# parameters and boundaries. note: this assumes that the uploaded file is sent as the last
# form parameter in the POST
# TODO: verify that the uploaded file is always sent as the last parameter
existing_file = current_uploads.get( file_id )
if existing_file:
existing_file.close()

15
static/js/Wiki.js
View File

@ -742,7 +742,7 @@ Wiki.prototype.display_link_pulldown = function ( editor, link ) {
new Link_pulldown( this, this.notebook_id, this.invoker, editor, link );
else {
if ( /\/files\/new$/.test( link.href ) )
new Upload_pulldown( this, this.notebook_id, this.invoker, editor );
new Upload_pulldown( this, this.notebook_id, this.invoker, editor, link );
else
new File_link_pulldown( this, this.notebook_id, this.invoker, editor, link );
}
@ -996,9 +996,9 @@ Wiki.prototype.toggle_attach_button = function ( event ) {
if ( this.focused_editor && this.focused_editor.read_write ) {
this.focused_editor.focus();
if ( this.toggle_image_button( "attachFile" ) )
this.focused_editor.start_file_link();
var link = this.focused_editor.start_file_link();
else
this.focused_editor.end_link();
var link = this.focused_editor.end_link();
// if a pulldown is already open, then just close it
var pulldown_id = "upload_" + this.focused_editor.id;
@ -1016,7 +1016,7 @@ Wiki.prototype.toggle_attach_button = function ( event ) {
this.clear_messages();
this.clear_pulldowns();
new Upload_pulldown( this, this.notebook_id, this.invoker, this.focused_editor );
new Upload_pulldown( this, this.notebook_id, this.invoker, this.focused_editor, link );
}
event.stop();
@ -2251,8 +2251,8 @@ Link_pulldown.prototype.shutdown = function () {
this.link.pulldown = null;
}
function Upload_pulldown( wiki, notebook_id, invoker, editor ) {
this.link = editor.find_link_at_cursor();
function Upload_pulldown( wiki, notebook_id, invoker, editor, link ) {
this.link = link || editor.find_link_at_cursor();
this.link.pulldown = this;
Pulldown.call( this, wiki, notebook_id, "upload_" + editor.id, this.link, editor.iframe );
@ -2327,8 +2327,7 @@ Upload_pulldown.prototype.upload_started = function ( file_id ) {
// if the current title is blank, replace the title with the upload's filename
var title = link_title( this.link );
if ( title == "" )
// FIXME: this may (sometimes) kill the text cursor in IE 6 and 7
replaceChildNodes( this.link, this.editor.document.createTextNode( filename ) );
this.link.innerHTML = filename;
removeElementClass( this.progress_iframe, "undisplayed" );
var progress_url = "/files/progress?file_id=" + file_id + "&filename=" + escape( filename );