From c4614788c6916918fd5afe2c8a6588e2e8b008b2 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 23 May 2015 08:34:54 +0930
Subject: [PATCH] Make the invoker responsible for positioning the composer
 cursor

---
 js/forum/src/components/composer-body.js | 6 +-----
 js/forum/src/components/composer.js      | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/js/forum/src/components/composer-body.js b/js/forum/src/components/composer-body.js
index 192428e93..5484727d9 100644
--- a/js/forum/src/components/composer-body.js
+++ b/js/forum/src/components/composer-body.js
@@ -43,11 +43,7 @@ export default class ComposerBody extends Component {
     this.ready(true);
     m.redraw();
 
-    var $input = this.$().find(':input:enabled:visible:first');
-    if ($input.length) {
-      $input.focus();
-      $input[0].selectionStart = $input[0].selectionEnd = $input.val().length;
-    }
+    this.$(':input:enabled:visible:first').focus();
   }
 
   preventExit() {
diff --git a/js/forum/src/components/composer.js b/js/forum/src/components/composer.js
index d70a13173..74f5dabc6 100644
--- a/js/forum/src/components/composer.js
+++ b/js/forum/src/components/composer.js
@@ -133,7 +133,7 @@ class Composer extends Component {
   }
 
   render(anchorToBottom) {
-    if (this.position() === this.oldPosition) { return; }
+    if (this.position() === this.oldPosition) { this.component.focus(); return; }
 
     var $composer = this.$().stop(true);
     var oldHeight = $composer.is(':visible') ? $composer.outerHeight() : 0;