From 403fda3590d5ab850c04f0b36173c9478291b110 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Thu, 12 Feb 2009 03:38:14 -0800 Subject: [PATCH] Fixed a bug in which hiding a note could produce a spurious save conflict notification error. The solution involves no longer calling Wiki.focused_editor( null ) in Wiki.hide_editor(). --- NEWS | 2 ++ static/js/Wiki.js | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index a528da6..eff608b 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,8 @@ * Fixed bugs related to the display and hiding of previous note revisions. * Fixed a bug in which moving a note and then clicking the "changes" tab on any other note failed to show that note's previous revisions. + * Fixed a bug in which hiding a note could produce a spurious save conflict + notification error. 1.6.3: February 11, 2009 * Introduced cache-busting code to make pages update more reliably after a diff --git a/static/js/Wiki.js b/static/js/Wiki.js index 8c985d3..0bd2f39 100644 --- a/static/js/Wiki.js +++ b/static/js/Wiki.js @@ -1528,9 +1528,6 @@ Wiki.prototype.hide_editor = function ( event, editor ) { this.clear_messages(); this.clear_pulldowns(); - if ( this.focused_editor ) - this.editor_focused( null ); - if ( !editor ) { editor = this.focused_editor; this.focused_editor = null; @@ -1567,9 +1564,6 @@ Wiki.prototype.delete_editor = function ( event, editor ) { this.clear_messages(); this.clear_pulldowns(); - if ( this.focused_editor ) - this.editor_focused( null ); - if ( !editor ) { editor = this.focused_editor; this.focused_editor = null;