Focus compose area on quoting a text (#342)

Fixes #251
threema-ch · Sep 14, 2017 · 42ec03b · 42ec03b
1 parent c2772dc
commit 42ec03b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/directives/compose_area.ts b/src/directives/compose_area.ts
@@ -30,13 +30,15 @@ export default [
     '$mdDialog',
     '$filter',
     '$log',
+    '$rootScope',
     function(browserService: BrowserService,
              stringService: StringService,
              $window, $timeout: ng.ITimeoutService,
              $translate: ng.translate.ITranslateService,
              $mdDialog: ng.material.IDialogService,
              $filter: ng.IFilterService,
-             $log: ng.ILogService) {
+             $log: ng.ILogService,
+             $rootScope: ng.IRootScopeService) {
         return {
             restrict: 'EA',
             scope: {
@@ -656,6 +658,10 @@ export default [
                 sendTrigger.on('click', onSendTrigger);
 
                 updateView();
+
+                $rootScope.$on('onQuoted', (event: ng.IAngularEvent, args: any) => {
+                    composeDiv[0].focus();
+                });
             },
             // tslint:disable:max-line-length
             template: `

diff --git a/src/services/webclient.ts b/src/services/webclient.ts
@@ -1303,10 +1303,16 @@ export class WebClientService {
             }
 
             if (quoteText !== undefined) {
-                this.drafts.setQuote(receiver, {
+                let quote = {
                     identity: message.isOutbox ? this.me.id : message.partnerId,
                     text: quoteText,
-                } as threema.Quote);
+                } as threema.Quote;
+
+                this.drafts.setQuote(receiver, quote);
+                this.$rootScope.$broadcast('onQuoted', {
+                    receiver: receiver,
+                    quote: quote,
+                });
             }
         }
     }