From c03c54026f5954308e854f48e2e425bdeb02bf09 Mon Sep 17 00:00:00 2001
From: Dan Helfman <dan@luminotes.com>
Date: Tue, 10 Feb 2009 02:17:28 -0800
Subject: [PATCH] Better interaction between empty notes and note reordering
 via dragging.

---
 controller/Notebooks.py |  2 +-
 static/js/Wiki.js       | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/controller/Notebooks.py b/controller/Notebooks.py
index dc776b0..e29bc28 100644
--- a/controller/Notebooks.py
+++ b/controller/Notebooks.py
@@ -783,7 +783,7 @@ class Notebooks( object ):
     # otherwise, create a new note
     else:
       if position_after or position_before:
-        note.rank = calculate_rank( position_after, position_before )
+        rank = calculate_rank( position_after, position_before )
       else:
         rank = self.__database.select_one( float, notebook.sql_highest_note_rank() ) + 1
   
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index 327cca4..97d4f19 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -848,7 +848,7 @@ Wiki.prototype.create_editor = function ( id, note_text, deleted_from_id, revisi
     connect( editor, "options_clicked", function ( event ) { self.toggle_editor_options( event, editor ) } );
     connect( editor, "focused", this, "editor_focused" );
     connect( editor, "mouse_hovered", function ( target ) { self.editor_mouse_hovered( editor, target ) } );
-    connect( editor, "grabber_pressed", function ( event ) { self.editor_focused( null ); } );
+    connect( editor, "grabber_pressed", function ( event ) { self.editor_focused( null, false, false ); } );
     connect( editor, "moved", function ( editor, position_after, position_before ) {
       self.editor_moved( editor, position_after, position_before );
     } );
@@ -1016,7 +1016,10 @@ Wiki.prototype.update_link_with_suggestion = function ( editor, link, note ) {
   this.display_link_pulldown( editor, link );
 }
 
-Wiki.prototype.editor_focused = function ( editor, synchronous ) {
+Wiki.prototype.editor_focused = function ( editor, synchronous, remove_empty ) {
+  if ( remove_empty == undefined )
+    remove_empty = true;
+
   if ( this.focused_editor && this.focused_editor != editor ) {
     this.focused_editor.blur();
     this.clear_pulldowns();
@@ -1026,7 +1029,7 @@ Wiki.prototype.editor_focused = function ( editor, synchronous ) {
       this.focused_editor.release_iframe();
 
     // if the formerly focused editor is completely empty, then remove it as the user leaves it and switches to this editor
-    if ( this.focused_editor.empty() ) {
+    if ( this.focused_editor.empty() && remove_empty ) {
       signal( this, "note_removed", this.focused_editor.id );
       this.focused_editor.shutdown();
       this.decrement_total_notes_count();
@@ -1698,8 +1701,8 @@ Wiki.prototype.save_editor = function ( editor, fire_and_forget, callback, synch
     editor = this.focused_editor;
 
   var self = this;
-  if ( editor && editor.read_write && !editor.empty() && !editor.closed &&
-       ( editor.dirty() || position_after || position_before ) ) {
+  if ( editor && editor.read_write && !editor.closed &&
+       ( ( !editor.empty() && editor.dirty() ) || position_after || position_before ) ) {
     editor.scrape_title();
 
     this.invoker.invoke( "/notebooks/save_note", "POST", {