Merge pull request #216 from dpaloucva/MOBILE-1218

MOBILE-1218 keyboard: Close keyboard when submitting some forms
moodlehq · Sep 10, 2015 · c0e5e5a · c0e5e5a
2 parents 4d62590 + bb77588
commit c0e5e5a
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 5 deletions.
diff --git a/www/addons/messages/controllers/contacts.js b/www/addons/messages/controllers/contacts.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.messages')
  * @ngdoc controller
  * @name mmaMessagesContactsCtrl
  */
-.controller('mmaMessagesContactsCtrl', function($scope, $mmaMessages, $mmSite, $mmUtil, mmUserProfileState) {
+.controller('mmaMessagesContactsCtrl', function($scope, $mmaMessages, $mmSite, $mmUtil, $mmApp, mmUserProfileState) {
 
     var currentUserId = $mmSite.getUserId();
 
@@ -52,6 +52,9 @@ angular.module('mm.addons.messages')
             // too many users!
             return;
         }
+
+        $mmApp.closeKeyboard();
+
         $scope.loaded = false;
         return $mmaMessages.searchContacts(query).then(function(result) {
             $scope.hasContacts = result.length > 0;

diff --git a/www/addons/messages/controllers/discussion.js b/www/addons/messages/controllers/discussion.js
@@ -102,6 +102,11 @@ angular.module('mm.addons.messages')
             message.sending = false;
             notifyNewMessage();
         }, function(error) {
+
+            // Only close the keyboard if an error happens, we want the user to be able to send multiple
+            // messages withoutthe keyboard being closed.
+            $mmApp.closeKeyboard();
+
             if (typeof error === 'string') {
                 $mmUtil.showErrorModal(error);
             } else {

diff --git a/www/addons/mod_chat/controllers/chat.js b/www/addons/mod_chat/controllers/chat.js
@@ -137,6 +137,10 @@ angular.module('mm.addons.mod_chat')
                 $scope.newMessage.text = '';
             }
         }, function(error) {
+            // Only close the keyboard if an error happens, we want the user to be able to send multiple
+            // messages withoutthe keyboard being closed.
+            $mmApp.closeKeyboard();
+
             showError(error);
         });
     };

diff --git a/www/addons/notes/services/handlers.js b/www/addons/notes/services/handlers.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.notes')
  * @ngdoc service
  * @name $mmaNotesHandlers
  */
-.factory('$mmaNotesHandlers', function($mmaNotes, $mmSite, $translate, $ionicLoading, $ionicModal, $mmUtil) {
+.factory('$mmaNotesHandlers', function($mmaNotes, $mmSite, $mmApp, $ionicModal, $mmUtil) {
 
     var self = {};
 
@@ -92,6 +92,9 @@ angular.module('mm.addons.notes')
                 };
 
                 $scope.addNote = function(){
+
+                    $mmApp.closeKeyboard();
+
                     var loadingModal = $mmUtil.showModalLoading('mm.core.sending', true);
                     // Freeze the add note button.
                     $scope.processing = true;

diff --git a/www/core/components/login/controllers/credentials.js b/www/core/components/login/controllers/credentials.js
@@ -21,13 +21,15 @@ angular.module('mm.core.login')
  * @ngdoc controller
  * @name mmLoginCredentialsCtrl
  */
-.controller('mmLoginCredentialsCtrl', function($scope, $state, $stateParams, $mmSitesManager, $mmUtil, $ionicHistory) {
+.controller('mmLoginCredentialsCtrl', function($scope, $state, $stateParams, $mmSitesManager, $mmUtil, $ionicHistory, $mmApp) {
 
     $scope.siteurl = $stateParams.siteurl;
     $scope.credentials = {};
 
     $scope.login = function() {
 
+        $mmApp.closeKeyboard();
+
         // Get input data.
         var siteurl = $scope.siteurl,
             username = $scope.credentials.username,

diff --git a/www/core/components/login/controllers/reconnect.js b/www/core/components/login/controllers/reconnect.js
@@ -21,7 +21,7 @@ angular.module('mm.core.login')
  * @ngdoc controller
  * @name mmLoginReconnectCtrl
  */
-.controller('mmLoginReconnectCtrl', function($scope, $state, $stateParams, $mmSitesManager, $mmSite, $mmUtil, $ionicHistory) {
+.controller('mmLoginReconnectCtrl', function($scope, $state, $stateParams, $mmSitesManager, $mmApp, $mmUtil, $ionicHistory) {
 
     var infositeurl = $stateParams.infositeurl; // Siteurl in site info. It might be different than siteurl (http/https).
     $scope.siteurl = $stateParams.siteurl;
@@ -42,6 +42,8 @@ angular.module('mm.core.login')
 
     $scope.login = function() {
 
+        $mmApp.closeKeyboard();
+
         // Get input data.
         var siteurl = $scope.siteurl,
             username = $scope.credentials.username,

diff --git a/www/core/components/login/controllers/site.js b/www/core/components/login/controllers/site.js
@@ -21,7 +21,7 @@ angular.module('mm.core.login')
  * @ngdoc controller
  * @name mmLoginSiteCtrl
  */
-.controller('mmLoginSiteCtrl', function($scope, $state, $mmSitesManager, $mmUtil, $translate, $ionicHistory,
+.controller('mmLoginSiteCtrl', function($scope, $state, $mmSitesManager, $mmUtil, $translate, $ionicHistory, $mmApp,
         $ionicModal, $mmLoginHelper) {
 
     $scope.siteurl = '';
@@ -45,6 +45,8 @@ angular.module('mm.core.login')
 
     $scope.connect = function(url) {
 
+        $mmApp.closeKeyboard();
+
         if (!url) {
             $mmUtil.showErrorModal('mm.login.siteurlrequired', true);
             return;

diff --git a/www/core/lib/app.js b/www/core/lib/app.js
@@ -111,6 +111,19 @@ angular.module('mm.core')
             $stateProvider.state(name, config);
         };
 
+        /**
+         * Closes the keyboard if plugin is available.
+         *
+         * @return {Boolean} True if plugin is available, false otherwise.
+         */
+        self.closeKeyboard = function() {
+            if (cordova && cordova.plugins && cordova.plugins.Keyboard && cordova.plugins.Keyboard.close) {
+                cordova.plugins.Keyboard.close();
+                return true;
+            }
+            return false;
+        };
+
         /**
          * Get the application global database.
          * @return {Object} App's DB.