You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2015/03/19 17:56:26 UTC

[37/50] [abbrv] ios commit: CB-8709 - Remove usage of obsolete CDVLocalStorage fix in CDVViewController.m (plus style fix-ups)

CB-8709 - Remove usage of obsolete CDVLocalStorage fix in CDVViewController.m (plus style fix-ups)


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

Branch: refs/heads/unplug-whitelist
Commit: 5920ef2b2a007b3acf483c882cf5e6818738284c
Parents: 987c515
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Mar 18 15:11:52 2015 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Mar 18 15:11:52 2015 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/Public/CDV.h               | 1 -
 CordovaLib/Classes/Public/CDVViewController.m | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5920ef2b/CordovaLib/Classes/Public/CDV.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/CDV.h b/CordovaLib/Classes/Public/CDV.h
index fbeaea2..732494c 100644
--- a/CordovaLib/Classes/Public/CDV.h
+++ b/CordovaLib/Classes/Public/CDV.h
@@ -27,7 +27,6 @@
 #import "CDVURLProtocol.h"
 #import "CDVInvokedUrlCommand.h"
 #import "CDVWhitelist.h"
-#import "CDVLocalStorage.h"
 #import "CDVPlugin.h"
 #import "CDVPluginResult.h"
 #import "CDVScreenOrientationDelegate.h"

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/5920ef2b/CordovaLib/Classes/Public/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/CDVViewController.m b/CordovaLib/Classes/Public/CDVViewController.m
index 6b40a84..bf7e532 100644
--- a/CordovaLib/Classes/Public/CDVViewController.m
+++ b/CordovaLib/Classes/Public/CDVViewController.m
@@ -279,8 +279,6 @@
     }
     [self.settings setCordovaSetting:backupWebStorageType forKey:@"BackupWebStorage"];
 
-    [CDVLocalStorage __fixupDatabaseLocationsWithBackupType:backupWebStorageType];
-
     // // Instantiate the WebView ///////////////
 
     if (!self.webView) {
@@ -694,7 +692,7 @@
 + (NSString*)applicationDocumentsDirectory
 {
     NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-    NSString* basePath = (([paths count] > 0) ? ([paths objectAtIndex:0]) : nil);
+    NSString* basePath = (([paths count] > 0) ? ([paths objectAtIndex : 0]) : nil);
 
     return basePath;
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org