Revert "MOBILE-1891 ios: Fix send message bar hidden by keyboard"

This reverts commit a7dc28c.
moodlehq · Dec 12, 2016 · 3ddeddb · 3ddeddb
1 parent 8584241
commit 3ddeddb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 deletions.
diff --git a/www/addons/messages/templates/discussion.html b/www/addons/messages/templates/discussion.html
@@ -38,7 +38,7 @@
         </mm-loading>
     </ion-content>
 
-    <ion-footer-bar class="bar-light" keyboard-attach>
+    <ion-footer-bar class="bar-light">
         <form class="mma-messages-send-message-bar" ng-submit="sendMessage(newMessage); newMessage = '';">
             <div class="mma-messages-input-inset item-input-inset">
                 <ion-input class="item-input-wrapper">

diff --git a/www/addons/mod/chat/templates/chat.html b/www/addons/mod/chat/templates/chat.html
@@ -46,7 +46,7 @@ <h2>{{ message.userfullname }}</h2>
         </mm-loading>
     </ion-content>
 
-    <ion-footer-bar keyboard-attach>
+    <ion-footer-bar>
         <p class="mma-chat-footer-note" ng-if="isAppOffline()">{{ 'mma.mod_chat.mustbeonlinetosendmessages' | translate }}</p>
         <form ng-if="!isAppOffline() && polling && loaded" class="mma-chat-send-form" ng-submit="sendMessage(newMessage.text);">
             <div class="mma-chat-input-inset item-input-inset">

diff --git a/www/core/main.js b/www/core/main.js
@@ -191,32 +191,16 @@ angular.module('mm.core', ['pascalprecht.translate'])
         $window.addEventListener('native.keyboardshow', function(e) {
             $mmEvents.trigger(mmCoreEventKeyboardShow, e);
 
-            if (ionic.Platform.isIOS() && document.activeElement && document.activeElement.tagName != 'BODY') {
-                if ($mmUtil.closest(document.activeElement, 'ion-footer-bar[keyboard-attach]')) {
-                    // Input element is in a footer with keyboard-attach directive, nothing to be done.
-                    return;
-                }
-
+            if (ionic.Platform.isIOS()) {
                 // In iOS the user can select elements outside of the view using previous/next. Check if it's the case.
                 if ($mmUtil.isElementOutsideOfScreen(document.activeElement)) {
                     // Focused element is outside of the screen. Scroll so the element is seen.
-                    var position = $mmUtil.getElementXY(document.activeElement),
-                        delegateHandle = $mmUtil.closest(document.activeElement, '*[delegate-handle]'),
-                        scrollView;
-
+                    var position = $mmUtil.getElementXY(document.activeElement);
                     if (position) {
                         if ($window && $window.innerHeight) {
-                            // Put the input in the middle of screen aprox, not in top.
                             position[1] = position[1] - $window.innerHeight * 0.5;
                         }
-
-                        // Get the right scroll delegate to use.
-                        delegateHandle = delegateHandle && delegateHandle.getAttribute('delegate-handle');
-                        scrollView = typeof delegateHandle == 'string' ?
-                                $ionicScrollDelegate.$getByHandle(delegateHandle) : $ionicScrollDelegate;
-
-                        // Scroll to the position.
-                        scrollView.scrollTo(position[0], position[1]);
+                        $ionicScrollDelegate.scrollTo(position[0], position[1]);
                     }
                 }
             }