You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2015/03/06 23:27:42 UTC
[10/31] ios commit: Have CordovaLib classes import CDVJSON_private.h
rather than CDVJSON.h
Have CordovaLib classes import CDVJSON_private.h rather than CDVJSON.h
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/fd941c3c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/fd941c3c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/fd941c3c
Branch: refs/heads/wkwebview
Commit: fd941c3c7bbf7705087be7c2ecc23ca432036a56
Parents: 3815e83
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jan 27 12:00:02 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jan 27 12:00:02 2015 -0500
----------------------------------------------------------------------
CordovaLib/Classes/CDVCommandDelegateImpl.m | 7 +++----
CordovaLib/Classes/CDVInvokedUrlCommand.m | 2 +-
CordovaLib/Classes/CDVJSON_private.m | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/fd941c3c/CordovaLib/Classes/CDVCommandDelegateImpl.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCommandDelegateImpl.m b/CordovaLib/Classes/CDVCommandDelegateImpl.m
index fc3346d..9407e0a 100644
--- a/CordovaLib/Classes/CDVCommandDelegateImpl.m
+++ b/CordovaLib/Classes/CDVCommandDelegateImpl.m
@@ -18,7 +18,7 @@
*/
#import "CDVCommandDelegateImpl.h"
-#import "CDVJSON.h"
+#import "CDVJSON_private.h"
#import "CDVCommandQueue.h"
#import "CDVPluginResult.h"
#import "CDVViewController.h"
@@ -31,7 +31,7 @@
if (self != nil) {
_viewController = viewController;
_commandQueue = _viewController.commandQueue;
-
+
NSError* err = nil;
_callbackIdPattern = [NSRegularExpression regularExpressionWithPattern:@"[^A-Za-z0-9._-]" options:0 error:&err];
if (err != nil) {
@@ -104,8 +104,7 @@
- (BOOL)isValidCallbackId:(NSString*)callbackId
{
-
- if (callbackId == nil || _callbackIdPattern == nil) {
+ if ((callbackId == nil) || (_callbackIdPattern == nil)) {
return NO;
}
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/fd941c3c/CordovaLib/Classes/CDVInvokedUrlCommand.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVInvokedUrlCommand.m b/CordovaLib/Classes/CDVInvokedUrlCommand.m
index ce5f41a..3a5e8e7 100644
--- a/CordovaLib/Classes/CDVInvokedUrlCommand.m
+++ b/CordovaLib/Classes/CDVInvokedUrlCommand.m
@@ -18,7 +18,7 @@
*/
#import "CDVInvokedUrlCommand.h"
-#import "CDVJSON.h"
+#import "CDVJSON_private.h"
#import "NSData+Base64.h"
@implementation CDVInvokedUrlCommand
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/fd941c3c/CordovaLib/Classes/CDVJSON_private.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVJSON_private.m b/CordovaLib/Classes/CDVJSON_private.m
index ca928bc..5385680 100644
--- a/CordovaLib/Classes/CDVJSON_private.m
+++ b/CordovaLib/Classes/CDVJSON_private.m
@@ -17,7 +17,7 @@
under the License.
*/
-#import "CDVJSON.h"
+#import "CDVJSON_private.h"
#import <Foundation/NSJSONSerialization.h>
@implementation NSArray (CDVJSONSerializingPrivate)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org