witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Made upload pulldown never ephemeral, since when it was, it could sometimes disappear in IE after you selected a file to upload.

This commit is contained in:
Dan Helfman 2009-03-20 15:57:44 -07:00
parent 588e0906b9
commit 0d91bc043e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
static/js/Wiki.js
View File

@ -999,7 +999,7 @@ Wiki.prototype.display_link_pulldown = function ( editor, link, ephemeral ) {
new Link_pulldown( this, this.notebook.object_id, this.invoker, editor, link, ephemeral ); new Link_pulldown( this, this.notebook.object_id, this.invoker, editor, link, ephemeral );
else { else {
if ( /\/files\/new$/.test( link.href ) ) if ( /\/files\/new$/.test( link.href ) )
new Upload_pulldown( this, this.notebook.object_id, this.invoker, editor, link, null, ephemeral ); new Upload_pulldown( this, this.notebook.object_id, this.invoker, editor, link, null );
else else
new File_link_pulldown( this, this.notebook.object_id, this.invoker, editor, link, ephemeral ); new File_link_pulldown( this, this.notebook.object_id, this.invoker, editor, link, ephemeral );
} }
@ -3210,6 +3210,8 @@ Pulldown.prototype.update_position = function ( always_left_align ) {
} }
Pulldown.prototype.shutdown = function () { Pulldown.prototype.shutdown = function () {
disconnectAll( this.div );
if ( this.div && this.div.parentNode ) if ( this.div && this.div.parentNode )
removeElement( this.div ); removeElement( this.div );
} }
@ -3602,7 +3604,7 @@ function base_upload_filename() {
} }
function Upload_pulldown( wiki, notebook_id, invoker, editor, link, anchor, ephemeral ) { function Upload_pulldown( wiki, notebook_id, invoker, editor, link, anchor ) {
this.link = link || ( editor ? editor.find_link_at_cursor() : null ); this.link = link || ( editor ? editor.find_link_at_cursor() : null );
if ( this.link ) if ( this.link )
this.link.pulldown = this; this.link.pulldown = this;
@ -3612,7 +3614,7 @@ function Upload_pulldown( wiki, notebook_id, invoker, editor, link, anchor, ephe
"upload_" + ( editor ? editor.id : "import" ), "upload_" + ( editor ? editor.id : "import" ),
this.link || anchor, this.link || anchor,
editor ? editor.iframe : null, editor ? editor.iframe : null,
ephemeral false
); );
wiki.down_image_button( "attachFile" ); wiki.down_image_button( "attachFile" );
@ -3695,7 +3697,6 @@ Upload_pulldown.prototype.update_file_id = function ( result ) {
} }
Upload_pulldown.prototype.upload_started = function ( file_id ) { Upload_pulldown.prototype.upload_started = function ( file_id ) {
this.ephemeral = false;
this.uploading = true; this.uploading = true;
var filename = base_upload_filename(); var filename = base_upload_filename();