incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject [3/7] ios commit: Minor cleanups
Date Fri, 24 Aug 2012 00:19:42 GMT
Minor cleanups


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/e6788bab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/e6788bab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/e6788bab

Branch: refs/heads/master
Commit: e6788babb296c464327c1153df429aea14a99716
Parents: 1d146cc
Author: Michal Mocny <mmocny@gmail.com>
Authored: Wed Aug 22 14:55:55 2012 -0400
Committer: Michal Mocny <mmocny@gmail.com>
Committed: Wed Aug 22 14:55:55 2012 -0400

----------------------------------------------------------------------
 CordovaLib/Classes/CDVLocalStorage.m   |    6 +++---
 CordovaLib/Classes/CDVViewController.m |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/e6788bab/CordovaLib/Classes/CDVLocalStorage.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVLocalStorage.m b/CordovaLib/Classes/CDVLocalStorage.m
index 6e74270..9f51f18 100644
--- a/CordovaLib/Classes/CDVLocalStorage.m
+++ b/CordovaLib/Classes/CDVLocalStorage.m
@@ -54,6 +54,9 @@
     return self;
 }
 
+#pragma mark -
+#pragma mark Plugin interface methods
+
 + (NSMutableArray*) createBackupInfo
 {
     NSMutableArray* backupInfo = [NSMutableArray arrayWithCapacity:3];
@@ -114,9 +117,6 @@
     return backupInfo;
 }
 
-#pragma mark -
-#pragma mark Plugin interface methods
-
 + (BOOL) copyFrom:(NSString*)src to:(NSString*)dest error:(NSError* __autoreleasing*)error
 {
     NSFileManager* fileManager = [NSFileManager defaultManager];

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/e6788bab/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index fae4b76..8cdb109 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -223,9 +223,9 @@
      * Fire up CDVLocalStorage on iOS 5.1 to work-around WebKit storage limitations, or adjust
set user defaults on iOS 6.0+
      */
     if (IsAtLeastiOSVersion(@"6.0")) {
-        [[NSUserDefaults standardUserDefaults] setBool:backupWebStorage forKey:@"WebKitStoreWebDataForBackup"];
         // We don't manually back anything up in 6.0 and so we should remove any old backups.
         [CDVLocalStorage __restoreThenRemoveBackupLocations];
+        [[NSUserDefaults standardUserDefaults] setBool:backupWebStorage forKey:@"WebKitStoreWebDataForBackup"];
     } else {
         if (backupWebStorage) {
             [self.commandDelegate registerPlugin:[[CDVLocalStorage alloc] initWithWebView:self.webView]
withClassName:NSStringFromClass([CDVLocalStorage class])];


Mime
View raw message