witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Fixed a bug in which emptying the trash worked but produced a spurious error message.

This commit is contained in:
Dan Helfman 2009-01-29 16:38:48 -08:00
parent b2648a037a
commit 47834ba541
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -4,6 +4,8 @@
* Fixed a bug in which performing a search when search results were already * Fixed a bug in which performing a search when search results were already
open would just hide the initial search results without showing the new open would just hide the initial search results without showing the new
ones. ones.
* Fixed a bug in which emptying the trash worked but produced a spurious
error message.
1.6.0: January 27, 2009 1.6.0: January 27, 2009
* Switching between notebooks and loading notebooks is now much faster. * Switching between notebooks and loading notebooks is now much faster.

18
static/js/Wiki.js
View File

@ -2733,6 +2733,7 @@ Wiki.prototype.clear_pulldowns = function ( ephemeral_only ) {
Wiki.prototype.delete_all_editors = function ( event ) { Wiki.prototype.delete_all_editors = function ( event ) {
this.clear_messages(); this.clear_messages();
this.clear_pulldowns(); this.clear_pulldowns();
this.editor_focused( null );
this.startup_notes = new Array(); this.startup_notes = new Array();
@ -2745,10 +2746,11 @@ Wiki.prototype.delete_all_editors = function ( event ) {
this.focused_editor = null; this.focused_editor = null;
var iframes = getElementsByTagAndClassName( "iframe", "note_frame" ); var divs = getElementsByTagAndClassName( "div", "static_note_div" );
for ( var i in iframes ) { for ( var i in divs ) {
var editor = iframes[ i ].editor; var editor = divs[ i ].editor;
editor.shutdown(); if ( editor )
editor.shutdown();
} }
this.zero_total_notes_count(); this.zero_total_notes_count();
@ -2776,8 +2778,12 @@ Wiki.prototype.display_empty_message = function ( replace_messages ) {
// if there are any open editors, bail // if there are any open editors, bail
if ( Editor.shared_frame && Editor.shared_frame.editor && !Editor.shared_frame.editor.closed ) if ( Editor.shared_frame && Editor.shared_frame.editor && !Editor.shared_frame.editor.closed )
return false; return false;
if ( getElementsByTagAndClassName( "div", "static_note_div" ).length > 0 ) var divs = getElementsByTagAndClassName( "div", "static_note_div" );
return false; for ( var i in divs ) {
var editor = divs[ i ].editor;
if ( editor && !editor.closed )
return;
}
if ( !this.total_notes_count ) { if ( !this.total_notes_count ) {
if ( this.parent_id ) if ( this.parent_id )