incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From becka...@apache.org
Subject ios commit: Fix contacts.save ret val and Notification.confirm
Date Fri, 16 Mar 2012 21:32:13 GMT
Updated Branches:
  refs/heads/master d5afabfee -> 1a9027e64


Fix contacts.save ret val and Notification.confirm

*contacts.save needs to return error as int
*added notification.confirm method (just calls existing alert)


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/1a9027e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/1a9027e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/1a9027e6

Branch: refs/heads/master
Commit: 1a9027e649d4425ea80644874f6f239c65e3f062
Parents: d5afabf
Author: Becky Gibson <becka11y@apache.org>
Authored: Fri Mar 16 17:30:50 2012 -0400
Committer: Becky Gibson <becka11y@apache.org>
Committed: Fri Mar 16 17:30:50 2012 -0400

----------------------------------------------------------------------
 CordovaLib/Classes/CDVContacts.m     |    2 +-
 CordovaLib/Classes/CDVNotification.h |    3 ++-
 CordovaLib/Classes/CDVNotification.m |    6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/1a9027e6/CordovaLib/Classes/CDVContacts.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVContacts.m b/CordovaLib/Classes/CDVContacts.m
index f2e7a57..2098c71 100755
--- a/CordovaLib/Classes/CDVContacts.m
+++ b/CordovaLib/Classes/CDVContacts.m
@@ -394,7 +394,7 @@
 	CFRelease(addrBook);
 		
 	if (bIsError){
-		result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageToErrorObject:
errCode];
+		result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsInt: errCode];
 		jsString = [result toErrorCallbackString:callbackId];
 	}
 	

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/1a9027e6/CordovaLib/Classes/CDVNotification.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVNotification.h b/CordovaLib/Classes/CDVNotification.h
index daff4b2..58f2afe 100644
--- a/CordovaLib/Classes/CDVNotification.h
+++ b/CordovaLib/Classes/CDVNotification.h
@@ -26,7 +26,8 @@
 @interface CDVNotification : CDVPlugin <UIAlertViewDelegate>{
 }
 
-- (void)alert:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options; // confirm
is just a variant of alert
+- (void)alert:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
+- (void)confirm:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
 - (void)vibrate:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
 
 @end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/1a9027e6/CordovaLib/Classes/CDVNotification.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVNotification.m b/CordovaLib/Classes/CDVNotification.m
index 6bb40b4..ceef8a1 100644
--- a/CordovaLib/Classes/CDVNotification.m
+++ b/CordovaLib/Classes/CDVNotification.m
@@ -57,8 +57,10 @@
 	[alertView show];
 	[alertView release];
 }
-
-
+- (void)confirm:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
+{   // confirm is just a variant of alert
+    [self alert: arguments withDict:options];
+}
 - (void)prompt:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
 {
 	NSString* callbackId = [arguments objectAtIndex:0];


Mime
View raw message