Merge pull request #4 from 720kb/focus_fix

Fix Focus after NFC Send
720kb · Nov 5, 2015 · 186a632 · 186a632
2 parents e617c06 + c5d5e28
commit 186a632
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/www/js/controllers/send.js b/www/js/controllers/send.js
@@ -3,8 +3,8 @@
   'use strict';
 
   angular.module('Send.controller', [])
-  .controller('SendCtrl', ['$rootScope', '$scope', '$window', '$log', '$stateParams', '$filter', 'BitCoin', 'CordovaClipboard',
-    function SendCtrlController($rootScope, $scope, $window, $log, $stateParams, $filter, BitCoin, CordovaClipboard) {
+  .controller('SendCtrl', ['$rootScope', '$scope', '$window', '$log', '$stateParams', '$filter', 'BitCoin', 'CordovaClipboard', '$timeout',
+    function SendCtrlController($rootScope, $scope, $window, $log, $stateParams, $filter, BitCoin, CordovaClipboard, $timeout) {
 
     var onNFCTag
       , inputToAddressElement = $window.document.getElementById('toAddress');
@@ -113,5 +113,11 @@
 
       onNFCTag();
     });
+
+    $scope.$on('focus', function setFocus() {
+      $timeout(function(){
+        document.querySelector("input[type=number]").focus();
+      }, 1);
+    });
   }]);
 }(angular));
diff --git a/www/js/index.js b/www/js/index.js
@@ -119,13 +119,14 @@
 
                 $state.go('app.send', {
                   'nfcAddress': $rootScope.tagAddress
+                }).then(function(){
+                  $rootScope.$broadcast('focus');
                 });
-                // TODO: focus on amount field - http://stackoverflow.com/a/22751353/160699 ?
               }
             }
           ]
         });
-      }
+      // }
     });
 
     $rootScope.$on('nfc:status-message', function onMessageTag(eventsInformations, payload) {

diff --git a/www/views/send/index.html b/www/views/send/index.html
@@ -36,7 +36,7 @@ <h5>To</h5>
           <h5>Amount</h5>
           <div class="separator5"></div>
           <label class="item item-input">
-            <input type="number" placeholder="0.0 mBTC" ng-model="sendForm.outputAmount">
+            <input type="number" placeholder="0.0 mBTC" ng-focus="sendFocus" ng-model="sendForm.outputAmount">
           </label>
              <!--all the errors and success messages-->
           <div ng-if="errorText || successText">