Changeset 2461 in subversion

Timestamp:

May 9, 2009 3:52:29 AM (4 years ago)

Author:

alec

Message:

• Correct caret position in message form with signature (#1485833)

File:

• trunk/roundcubemail/program/js/app.js (modified) (6 diffs)

trunk/roundcubemail/program/js/app.js

@@ -473 +473 @@
       input_subject.focus();
     else if (input_message)
-      this.set_caret2start(input_message);
+      input_message.focus();
 
     // get summary of all field values
@@ -2189 +2189 @@
     var message = input_message.val();
     var is_html = ($("input[name='_is_html']").val() == '1');
-    var sig, p;
+    var sig, p, len;
 
     if (!this.env.identity)
@@ -2213 +2213 @@
 
       message = message.replace(/[\r\n]+$/, '');
-      
+      len = message.length;
+
       // add the new signature string
       if (this.env.signatures && this.env.signatures[id])
@@ -2225 +2226 @@
           sig = '-- \n'+sig;
         message += '\n\n'+sig;
+        if (len) len += 1;
         }
       }
@@ -2270 +2272 @@
 
     input_message.val(message);
+
+    // move cursor before the signature
+    if (!is_html)
+      this.set_caret_pos(input_message.get(0), len);
 
     this.env.identity = id;
@@ -4012 +4018 @@
     };
 
-  this.set_caret2start = function(obj)
-    {
-    if (obj.createTextRange)
+  this.set_caret_pos = function(obj, pos)
+    {
+    if (obj.setSelectionRange)
+      obj.setSelectionRange(pos, pos);
+    else if (obj.createTextRange)
       {
       var range = obj.createTextRange();
       range.collapse(true);
+      range.moveEnd('character', pos);
+      range.moveStart('character', pos);
       range.select();
       }
-    else if (obj.setSelectionRange)
-      obj.setSelectionRange(0,0);
-
-    obj.focus();
-    };
+    }
 
   // set all fields of a form disabled