From 6bdacd272e8ced3ef3cbfaca2f9d95d23f1b7871 Mon Sep 17 00:00:00 2001
From: Dan Helfman <dan@luminotes.com>
Date: Mon, 28 Jan 2008 20:45:36 +0000
Subject: [PATCH]  * Replaced a workaround for a Firefox DesignMode bug. The
 bug causes a jumping    text cursor. The previous workaround involved
 appending <span> tags and had    other negative side-effects. The new
 workaround involves removing extra <br>    tags.

---
 NEWS                |  6 +++++-
 static/js/Editor.js | 36 +++++++++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 8f99aa1..0ef224b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
-1.1.3: January ??, 2008
+1.1.3: January 28, 2008
  * Now, if you delete a notebook and the only remaining notebook is read-only,
    then a new read-write notebook is created for you automatically.
  * Made use of HTML <label> tag for UI checkboxes and radio buttons.
+ * Replaced a workaround for a Firefox DesignMode bug. The bug causes a jumping
+   text cursor. The previous workaround involved appending <span> tags and had
+   other negative side-effects. The new workaround involves removing extra <br>
+   tags.
 
 1.1.2: January 22, 2008
  * You can no longer edit notes in the trash. You have to undelete them first.
diff --git a/static/js/Editor.js b/static/js/Editor.js
index be08e36..011de3c 100644
--- a/static/js/Editor.js
+++ b/static/js/Editor.js
@@ -12,6 +12,7 @@ function Editor( id, notebook_id, note_text, deleted_from_id, revision, read_wri
   this.init_focus = focus || false;
   this.closed = false;
   this.link_started = null;
+  this.gecko = /Gecko/.test( navigator.userAgent ) && !/like Gecko/.test( navigator.userAgent );
   var iframe_id = "note_" + id;
 
   var self = this;
@@ -280,13 +281,6 @@ Editor.prototype.insert_html = function ( html ) {
 
   try { // browsers supporting insertHTML command, such as Firefox
     this.document.execCommand( "insertHTML", false, html );
-
-    // for some reason, appending an empty span improves formatting
-    spans = getElementsByTagAndClassName( "span", null, parent = this.document );
-    if ( spans.length == 0 ) {
-      var span = this.document.createElement( "span" );
-      this.document.body.appendChild( span );
-    }
   } catch ( e ) { // browsers that don't support insertHTML, such as IE
     this.document.body.innerHTML = html;
   }
@@ -321,9 +315,37 @@ Editor.prototype.key_released = function ( event ) {
   if ( event.modifier().ctrl || code == CTRL )
     return;
 
+  this.cleanup_html();
+
   signal( this, "state_changed", this );
 }
 
+Editor.prototype.cleanup_html = function () {
+  // this only applies to Firefox and other Gecko-based browsers
+  if ( !this.gecko )
+    return;
+
+  // if you're typing the text of an <h3> title and you hit enter, the text cursor will skip a line
+  // and then move back up a line when you start typing again. to prevent this behavior, remove an
+  // extra <br> tag when this situation is detected before the current node: <h3><br>
+  if ( this.iframe.contentWindow && this.iframe.contentWindow.getSelection ) {
+    var selection = this.iframe.contentWindow.getSelection();
+    var range = selection.getRangeAt( 0 );
+    var startOffset = range.startOffset;
+
+    var node = range.startContainer.childNodes[ startOffset ];
+    if ( node && node.previousSibling && node.previousSibling.previousSibling &&
+         node.previousSibling.nodeName == "BR" &&
+         node.previousSibling.previousSibling.nodeName == "H3" ) {
+      removeElement( node.previousSibling );
+      if ( node.nodeName != "BR" )
+        insertSiblingNodesBefore( node, createDOM( "br" ) );
+      else
+        this.resize();
+    }
+  }
+}
+
 Editor.prototype.mouse_clicked = function ( event ) {
   this.link_started = null;