iOS updates

Author: tlancina

src/ios/IonicKeyboard.h

@@ -1,14 +1,15 @@
 #import <Cordova/CDVPlugin.h>
 
-@interface IonicKeyboard : CDVPlugin {
+@interface IonicKeyboard : CDVPlugin <UIScrollViewDelegate> {
     @protected
     id _keyboardShowObserver, _keyboardHideObserver;
 }
 
 @property (readwrite, assign, getter = hideKeyboardAccessoryBar, setter = setHideKeyboardAccessoryBar:)  BOOL hideKeyboardAccessoryBar;
-@property (readwrite, assign)  BOOL keyboardIsVisible;
+@property (readwrite, assign) BOOL disableScroll;
 
-//- (void) hideKeyboardAccessoryBar:(CDVInvokedUrlCommand*)command;
+- (void) hideKeyboardAccessoryBar:(CDVInvokedUrlCommand*)command;
 - (void) close:(CDVInvokedUrlCommand*)command;
 
 @end
+

src/ios/IonicKeyboard.m

@@ -2,21 +2,22 @@
 #import "UIWebViewAccessoryHiding.h"
 #import <Cordova/CDVAvailability.h>
 
-
 @implementation IonicKeyboard
 
 @synthesize hideKeyboardAccessoryBar = _hideKeyboardAccessoryBar;
+@synthesize disableScroll = _disableScroll;
 
 - (void)pluginInitialize
 {
-    
+  
     NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
     __weak IonicKeyboard* weakSelf = self;
+
+    //set defaults
+    weakSelf.hideKeyboardAccessoryBar = NO;
+    weakSelf.disableScroll = NO;
 
-    weakSelf.webView.scrollView.scrollEnabled = NO;
-  
-    //Until disabling the auto-scroll in iOS 7 works
-    self.hideKeyboardAccessoryBar = YES;
+    weakSelf.webView.scrollView.delegate = self;
 
     _keyboardShowObserver = [nc addObserverForName:UIKeyboardWillShowNotification
                                object:nil
@@ -27,6 +28,7 @@ - (void)pluginInitialize
                                    keyboardFrame = [self.viewController.view convertRect:keyboardFrame fromView:nil];
 
                                    [weakSelf.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.plugins.Keyboard.isVisible = true; cordova.fireWindowEvent('native.showkeyboard', { 'keyboardHeight': %@ }); ", [@(keyboardFrame.size.height) stringValue]]];
+                              
 
                                }];
 
@@ -37,6 +39,27 @@ - (void)pluginInitialize
                                    [weakSelf.commandDelegate evalJs:@"cordova.plugins.Keyboard.isVisible = false; cordova.fireWindowEvent('native.hidekeyboard'); "];
                                }];
 }
+- (BOOL)disableScroll
+{
+    return _disableScroll;
+}
+
+- (void)setDisableScroll:(BOOL)disableScroll
+{
+    __weak IonicKeyboard* weakSelf = self;
+
+    if (disableScroll == _disableScroll) {
+        return;
+    }
+    if (disableScroll){
+        weakSelf.webView.scrollView.scrollEnabled = NO;
+    }
+    else {
+        weakSelf.webView.scrollView.scrollEnabled = YES;
+    }
+
+    _disableScroll = disableScroll;
+}
 
 
 - (BOOL)hideKeyboardAccessoryBar
@@ -61,6 +84,14 @@ - (void)setHideKeyboardAccessoryBar:(BOOL)hideKeyboardAccessoryBar
     _hideKeyboardAccessoryBar = hideKeyboardAccessoryBar;
 }
 
+
+/* ------------------------------------------------------------- */
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+    [scrollView setContentOffset: CGPointZero];
+}
+
 /* ------------------------------------------------------------- */
 
 - (void)dealloc
@@ -73,25 +104,29 @@ - (void)dealloc
 
 /* ------------------------------------------------------------- */
 
-/*
-- (void) hideKeyboardAccessoryBar:(CDVInvokedUrlCommand*)command
+- (void) disableScroll:(CDVInvokedUrlCommand*)command
 {
+    if (!command.arguments || ![command.arguments count]){
+      return;
+    }
     id value = [command.arguments objectAtIndex:0];
-    if (!([value isKindOfClass:[NSNumber class]])) {
-        value = [NSNumber numberWithBool:NO];
+    
+    self.disableScroll = [value boolValue];
+}
+
+- (void) hideKeyboardAccessoryBar:(CDVInvokedUrlCommand*)command
+{
+    if (!command.arguments || ![command.arguments count]){
+      return;
     }
+    id value = [command.arguments objectAtIndex:0];
 
     self.hideKeyboardAccessoryBar = [value boolValue];
 }
-*/
 
 - (void) close:(CDVInvokedUrlCommand*)command
 {
     [self.webView endEditing:YES];
 }
 
-
 @end
-
-
-

www/keyboard.js

@@ -1,23 +1,3 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
 
 var argscheck = require('cordova/argscheck'),
     utils = require('cordova/utils'),
@@ -26,10 +6,6 @@ var argscheck = require('cordova/argscheck'),
 var Keyboard = function() {
 };
 
-Keyboard.resizeView = function(offset) {
-    exec(null, null, "Keyboard", "resizeView", [offset]);
-};
-
 Keyboard.hideKeyboardAccessoryBar = function(hide) {
     exec(null, null, "Keyboard", "hideKeyboardAccessoryBar", [hide]);
 };
@@ -38,8 +14,8 @@ Keyboard.close = function() {
  exec(null, null, "Keyboard", "close", []);
 };
 
-Keyboard.disableScroll = function() {
- exec(null, null, "Keyboard", "disableScroll", []);
+Keyboard.disableScroll = function(disable) {
+ exec(null, null, "Keyboard", "disableScroll", [disable]);
 };
 
 Keyboard.isVisible = false;