Bug 962328 - [SMS] The keyboard does not automatically appear when co…

…mposing a new SMS r=schung
borjasalguero · Feb 25, 2014 · 8f777b9 · 8f777b9
1 parent e1fb306
commit 8f777b9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/apps/sms/js/message_manager.js b/apps/sms/js/message_manager.js
@@ -253,6 +253,7 @@ var MessageManager = {
           if (ThreadUI.draft) {
             ThreadUI.draft.isEdited = false;
           }
+          ThreadUI.recipients.focus();
         }.bind(this));
         break;
       case '#thread-list':

diff --git a/apps/sms/test/unit/message_manager_test.js b/apps/sms/test/unit/message_manager_test.js
@@ -256,6 +256,7 @@ suite('message_manager.js >', function() {
 
     setup(function() {
       this.sinon.spy(ThreadUI, 'cleanFields');
+      this.sinon.spy(ThreadUI.recipients, 'focus');
       ThreadUI.draft = null;
       MessageManager.launchComposer();
     });
@@ -273,8 +274,8 @@ suite('message_manager.js >', function() {
         done();
       });
     });
-    suite('message drafts', function() {
 
+    suite('message drafts', function() {
       setup(function() {
         ThreadUI.draft = new Draft({
           threadId: 1234,
@@ -686,16 +687,28 @@ suite('message_manager.js >', function() {
         this.activity = MessageManager.activity = { test: true };
         MessageManager.handleActivity();
         ThreadUI.inThread = true; // to test this is reset correctly
+        this.sinon.spy(ThreadUI.recipients, 'focus');
         window.location.hash = '#new';
         MessageManager.onHashChange();
       });
+
       teardown(function() {
         MessageManager.activity = null;
       });
+
       test('called handleActivity with activity', function() {
         assert.ok(MessageManager.handleActivity.calledOnce);
       });
 
+      test('focus after show "composer"', function(done) {
+        this.sinon.stub(MessageManager, 'launchComposer', function(cb) {
+          cb && cb();
+          assert.ok(ThreadUI.recipients.focus.called);
+          done();
+        });
+        MessageManager.onHashChange();
+      });
+
       suite('> Switch to #thread=100', function() {
         var closeSpy;
         setup(function() {

diff --git a/apps/sms/test/unit/mock_thread_ui.js b/apps/sms/test/unit/mock_thread_ui.js
@@ -9,7 +9,8 @@ var MockThreadUI = {
   CONVERTED_MESSAGE_DURATION: 3000,
   IMAGE_RESIZE_DURATION: 3000,
   recipients: {
-    add: function() {}
+    add: function() {},
+    focus: function() {}
   },
   recipientsList: document.createElement('div'),