cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [19/19] ios commit: Merge branch 'master' into 4.0.x
Date Fri, 06 Mar 2015 04:01:55 GMT
Merge branch 'master' into 4.0.x

Conflicts:
	CordovaLib/CordovaLib.xcodeproj/project.pbxproj
	CordovaLib/VERSION
	package.json


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

Branch: refs/heads/4.0.x
Commit: c0085a8c8b0986de67d2a497663e94292eb05c1a
Parents: 4d5de42 4f02fca
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Mar 5 23:00:00 2015 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Mar 5 23:00:00 2015 -0500

----------------------------------------------------------------------
 .jshintignore                                   |   2 +
 .jshintrc                                       |  10 +
 .travis.yml                                     |   5 +-
 CordovaLib/Classes/CDVAvailability.h            |   3 +-
 CordovaLib/Classes/CDVHandleOpenURL.h           |  27 ++
 CordovaLib/Classes/CDVHandleOpenURL.m           |  74 +++++
 CordovaLib/Classes/CDVViewController.m          |   7 +-
 CordovaLib/CordovaLib.xcodeproj/project.pbxproj |   6 +
 CordovaLib/cordova.js                           |  19 +-
 RELEASENOTES.md                                 |  29 +-
 bin/lib/check_reqs.js                           |   4 +-
 bin/lib/create.js                               |  25 +-
 bin/lib/versions.js                             |   6 +-
 .../__PROJECT_NAME__/Classes/AppDelegate.m      |  37 +--
 .../project/__PROJECT_NAME__/config.xml         |  19 +-
 bin/templates/project/www/index.html            |  11 +-
 bin/templates/scripts/cordova/defaults.xml      |   5 -
 bin/templates/scripts/cordova/lib/build.js      |  43 +--
 bin/templates/scripts/cordova/lib/clean.js      |   2 +-
 bin/templates/scripts/cordova/lib/run.js        |  46 +--
 bin/templates/scripts/cordova/version           |   2 +-
 bin/uncrustify.sh                               |   9 +-
 cordova-js-src/exec.js                          | 323 +++++++++++++++++++
 cordova-js-src/platform.js                      |  28 ++
 hooks/pre-commit                                |   5 -
 package.json                                    |   9 +-
 tests/.jshintrc                                 |  11 +
 tests/CordovaLibTests/CordovaLibApp/config.xml  |   1 -
 tests/spec/cordovalib.spec.js                   |   2 +-
 29 files changed, 646 insertions(+), 124 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c0085a8c/CordovaLib/Classes/CDVHandleOpenURL.h
----------------------------------------------------------------------
diff --cc CordovaLib/Classes/CDVHandleOpenURL.h
index 0000000,24f461f..f9b0bff
mode 000000,100644..100644
--- a/CordovaLib/Classes/CDVHandleOpenURL.h
+++ b/CordovaLib/Classes/CDVHandleOpenURL.h
@@@ -1,0 -1,28 +1,27 @@@
+ /*
+  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.
+  */
+ 
+ #import "CDVPlugin.h"
+ 
+ @interface CDVHandleOpenURL : CDVPlugin
+ 
+ @property (nonatomic, strong) NSURL* url;
+ @property (nonatomic, assign) BOOL pageLoaded;
+ 
+ @end
 -

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c0085a8c/CordovaLib/Classes/CDVHandleOpenURL.m
----------------------------------------------------------------------
diff --cc CordovaLib/Classes/CDVHandleOpenURL.m
index 0000000,e5dcdd5..b0f5878
mode 000000,100644..100644
--- a/CordovaLib/Classes/CDVHandleOpenURL.m
+++ b/CordovaLib/Classes/CDVHandleOpenURL.m
@@@ -1,0 -1,74 +1,74 @@@
+ /*
+  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.
+  */
+ 
+ #import "CDVHandleOpenURL.h"
+ #import "CDV.h"
+ 
+ @implementation CDVHandleOpenURL
+ 
+ - (void)pluginInitialize
+ {
+     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationLaunchedWithUrl:)
name:CDVPluginHandleOpenURLNotification object:nil];
+     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationPageDidLoad:)
name:CDVPageDidLoadNotification object:nil];
+ }
+ 
+ - (void)applicationLaunchedWithUrl:(NSNotification*)notification
+ {
 -    NSURL *url = [notification object];
++    NSURL* url = [notification object];
++
+     self.url = url;
 -    
++
+     // warm-start handler
+     if (self.pageLoaded) {
+         [self processOpenUrl:self.url pageLoaded:YES];
+         self.url = nil;
+     }
+ }
+ 
+ - (void)applicationPageDidLoad:(NSNotification*)notification
+ {
+     // cold-start handler
 -    
++
+     self.pageLoaded = YES;
+ 
+     if (self.url) {
+         [self processOpenUrl:self.url pageLoaded:YES];
+         self.url = nil;
+     }
+ }
+ 
+ - (void)processOpenUrl:(NSURL*)url pageLoaded:(BOOL)pageLoaded
+ {
+     if (!pageLoaded) {
+         // query the webview for readystate
+         NSString* readyState = [self.webView stringByEvaluatingJavaScriptFromString:@"document.readyState"];
+         pageLoaded = [readyState isEqualToString:@"loaded"] || [readyState isEqualToString:@"complete"];
+     }
 -    
++
+     if (pageLoaded) {
+         // calls into javascript global function 'handleOpenURL'
 -                NSString* jsString = [NSString stringWithFormat:@"document.addEventListener('deviceready',function(){if
(typeof handleOpenURL === 'function') { handleOpenURL(\"%@\");}});", url];
++        NSString* jsString = [NSString stringWithFormat:@"document.addEventListener('deviceready',function(){if
(typeof handleOpenURL === 'function') { handleOpenURL(\"%@\");}});", url];
+         [self.webView stringByEvaluatingJavaScriptFromString:jsString];
+     } else {
+         // save for when page has loaded
+         self.url = url;
+     }
+ }
+ 
 -
+ @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c0085a8c/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --cc CordovaLib/Classes/CDVViewController.m
index eb056ce,6d81e8d..f368ceb
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@@ -339,7 -340,7 +340,7 @@@
      }
  
      NSString* decelerationSetting = [self settingForKey:@"UIWebViewDecelerationSpeed"];
--    if (![@"fast" isEqualToString:decelerationSetting]) {
++    if (![@"fast" isEqualToString : decelerationSetting]) {
          [self.webView.scrollView setDecelerationRate:UIScrollViewDecelerationRateNormal];
      }
  
@@@ -459,7 -460,9 +460,9 @@@
  
          [CDVTimer stop:@"TotalPluginStartup"];
      }
 -    
 +
+     [self registerPlugin:[[CDVHandleOpenURL alloc] initWithWebView:self.webView] withClassName:NSStringFromClass([CDVHandleOpenURL
class])];
 -    
++
      // /////////////////
      NSURL* appURL = [self appUrl];
  
@@@ -827,7 -830,7 +830,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;
  }

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c0085a8c/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --cc CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 8513f5e,c6b0f23..e91ade2
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@@ -20,7 -24,12 +20,9 @@@
  		30C684961407044B004C1A8E /* CDVURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef
= 30C684931407044A004C1A8E /* CDVURLProtocol.m */; };
  		30E33AF213A7E24B00594D64 /* CDVPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef =
30E33AF013A7E24B00594D64 /* CDVPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
  		30E33AF313A7E24B00594D64 /* CDVPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef =
30E33AF113A7E24B00594D64 /* CDVPlugin.m */; };
 -		30E563CF13E217EC00C949AA /* NSMutableArray+QueueAdditions.h in Headers */ = {isa = PBXBuildFile;
fileRef = 30E563CD13E217EC00C949AA /* NSMutableArray+QueueAdditions.h */; settings = {ATTRIBUTES
= (Public, ); }; };
  		30E563D013E217EC00C949AA /* NSMutableArray+QueueAdditions.m in Sources */ = {isa = PBXBuildFile;
fileRef = 30E563CE13E217EC00C949AA /* NSMutableArray+QueueAdditions.m */; };
+ 		30E6B8CD1A8ADD900025B9EE /* CDVHandleOpenURL.h in Headers */ = {isa = PBXBuildFile; fileRef
= 30E6B8CB1A8ADD900025B9EE /* CDVHandleOpenURL.h */; };
+ 		30E6B8CE1A8ADD900025B9EE /* CDVHandleOpenURL.m in Sources */ = {isa = PBXBuildFile; fileRef
= 30E6B8CC1A8ADD900025B9EE /* CDVHandleOpenURL.m */; };
 -		30F3930B169F839700B22307 /* CDVJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 30F39309169F839700B22307
/* CDVJSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
 -		30F3930C169F839700B22307 /* CDVJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = 30F3930A169F839700B22307
/* CDVJSON.m */; };
  		30F5EBAB14CA26E700987760 /* CDVCommandDelegate.h in Headers */ = {isa = PBXBuildFile;
fileRef = 30F5EBA914CA26E700987760 /* CDVCommandDelegate.h */; settings = {ATTRIBUTES = (Public,
); }; };
  		7E14B5A81705050A0032169E /* CDVTimer.h in Headers */ = {isa = PBXBuildFile; fileRef =
7E14B5A61705050A0032169E /* CDVTimer.h */; settings = {ATTRIBUTES = (Public, ); }; };
  		7E14B5A91705050A0032169E /* CDVTimer.m in Sources */ = {isa = PBXBuildFile; fileRef =
7E14B5A71705050A0032169E /* CDVTimer.m */; };
@@@ -60,12 -78,31 +62,14 @@@
  		30E33AF113A7E24B00594D64 /* CDVPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4;
lastKnownFileType = sourcecode.c.objc; name = CDVPlugin.m; path = Classes/CDVPlugin.m; sourceTree
= "<group>"; };
  		30E563CD13E217EC00C949AA /* NSMutableArray+QueueAdditions.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSMutableArray+QueueAdditions.h";
path = "Classes/NSMutableArray+QueueAdditions.h"; sourceTree = "<group>"; };
  		30E563CE13E217EC00C949AA /* NSMutableArray+QueueAdditions.m */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSMutableArray+QueueAdditions.m";
path = "Classes/NSMutableArray+QueueAdditions.m"; sourceTree = "<group>"; };
+ 		30E6B8CB1A8ADD900025B9EE /* CDVHandleOpenURL.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; name = CDVHandleOpenURL.h; path = Classes/CDVHandleOpenURL.h;
sourceTree = "<group>"; };
+ 		30E6B8CC1A8ADD900025B9EE /* CDVHandleOpenURL.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; name = CDVHandleOpenURL.m; path = Classes/CDVHandleOpenURL.m;
sourceTree = "<group>"; };
 -		30F39309169F839700B22307 /* CDVJSON.h */ = {isa = PBXFileReference; fileEncoding = 4;
lastKnownFileType = sourcecode.c.h; name = CDVJSON.h; path = Classes/CDVJSON.h; sourceTree
= "<group>"; };
 -		30F3930A169F839700B22307 /* CDVJSON.m */ = {isa = PBXFileReference; fileEncoding = 4;
lastKnownFileType = sourcecode.c.objc; name = CDVJSON.m; path = Classes/CDVJSON.m; sourceTree
= "<group>"; };
  		30F5EBA914CA26E700987760 /* CDVCommandDelegate.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; name = CDVCommandDelegate.h; path = Classes/CDVCommandDelegate.h;
sourceTree = "<group>"; };
 -		686357AA141002F100DF4CF2 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework;
sourceTree = SDKROOT; };
 -		686357AC141002F100DF4CF2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT; };
 -		686357AE141002F100DF4CF2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework;
sourceTree = SDKROOT; };
 -		686357CC14100AAD00DF4CF2 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework;
sourceTree = SDKROOT; };
 -		686357CE14100ADA00DF4CF2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework;
sourceTree = SDKROOT; };
 -		686357CF14100ADB00DF4CF2 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework;
sourceTree = SDKROOT; };
 -		686357D014100ADE00DF4CF2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework;
sourceTree = SDKROOT; };
 -		686357D214100AE700DF4CF2 /* MobileCoreServices.framework */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework;
sourceTree = SDKROOT; };
 -		686357D414100AF200DF4CF2 /* SystemConfiguration.framework */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework;
sourceTree = SDKROOT; };
 -		686357DC14100B1600DF4CF2 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework;
sourceTree = SDKROOT; };
  		68A32D7114102E1C006B237C /* libCordova.a */ = {isa = PBXFileReference; explicitFileType
= archive.ar; includeInIndex = 0; path = libCordova.a; sourceTree = BUILT_PRODUCTS_DIR; };
 -		68A32D7414103017006B237C /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework;
sourceTree = SDKROOT; };
  		7E14B5A61705050A0032169E /* CDVTimer.h */ = {isa = PBXFileReference; fileEncoding = 4;
lastKnownFileType = sourcecode.c.h; name = CDVTimer.h; path = Classes/CDVTimer.h; sourceTree
= "<group>"; };
  		7E14B5A71705050A0032169E /* CDVTimer.m */ = {isa = PBXFileReference; fileEncoding = 4;
lastKnownFileType = sourcecode.c.objc; name = CDVTimer.m; path = Classes/CDVTimer.m; sourceTree
= "<group>"; };
 -		7E22B88419E4C0210026F95E /* CDVAvailabilityDeprecated.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVAvailabilityDeprecated.h;
path = Classes/CDVAvailabilityDeprecated.h; sourceTree = "<group>"; };
 -		8220B5C316D5427E00EC3921 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework;
sourceTree = SDKROOT; };
  		8852C43614B65FD800F0E735 /* CDVViewController.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; name = CDVViewController.h; path = Classes/CDVViewController.h;
sourceTree = "<group>"; };
  		8852C43714B65FD800F0E735 /* CDVViewController.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; name = CDVViewController.m; path = Classes/CDVViewController.m;
sourceTree = "<group>"; };
 -		8887FD281090FBE7009987E8 /* NSDictionary+Extensions.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+Extensions.h"; path = "Classes/NSDictionary+Extensions.h";
sourceTree = "<group>"; };
 -		8887FD291090FBE7009987E8 /* NSDictionary+Extensions.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+Extensions.m"; path = "Classes/NSDictionary+Extensions.m";
sourceTree = "<group>"; };
  		8887FD341090FBE7009987E8 /* CDVInvokedUrlCommand.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; name = CDVInvokedUrlCommand.h; path = Classes/CDVInvokedUrlCommand.h;
sourceTree = "<group>"; };
  		8887FD351090FBE7009987E8 /* CDVInvokedUrlCommand.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; name = CDVInvokedUrlCommand.m; path = Classes/CDVInvokedUrlCommand.m;
sourceTree = "<group>"; };
  		8887FD501090FBE7009987E8 /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.h; name = "NSData+Base64.h"; path = "Classes/NSData+Base64.h";
sourceTree = "<group>"; };
@@@ -176,23 -269,33 +180,24 @@@
  			isa = PBXHeadersBuildPhase;
  			buildActionMask = 2147483647;
  			files = (
 -				8887FD681090FBE7009987E8 /* NSDictionary+Extensions.h in Headers */,
 -				8887FD741090FBE7009987E8 /* CDVInvokedUrlCommand.h in Headers */,
 -				8887FD8F1090FBE7009987E8 /* NSData+Base64.h in Headers */,
 -				1F92F4A01314023E0046367C /* CDVPluginResult.h in Headers */,
 +				301F2F2A14F3C9CA003FE9FC /* CDV.h in Headers */,
 +				30392E4E14F4FCAB00B9E0B8 /* CDVAvailability.h in Headers */,
 +				EB6A98401A729CD70013FCDB /* CDVAvailabilityDeprecated.h in Headers */,
  				30E33AF213A7E24B00594D64 /* CDVPlugin.h in Headers */,
 +				1F92F4A01314023E0046367C /* CDVPluginResult.h in Headers */,
+ 				30E6B8CD1A8ADD900025B9EE /* CDVHandleOpenURL.h in Headers */,
 -				302965BC13A94E9D007046C5 /* CDVDebug.h in Headers */,
 -				30E563CF13E217EC00C949AA /* NSMutableArray+QueueAdditions.h in Headers */,
 -				30C684801406CB38004C1A8E /* CDVWhitelist.h in Headers */,
 -				30C684941407044B004C1A8E /* CDVURLProtocol.h in Headers */,
  				8852C43A14B65FD800F0E735 /* CDVViewController.h in Headers */,
  				30F5EBAB14CA26E700987760 /* CDVCommandDelegate.h in Headers */,
 -				301F2F2A14F3C9CA003FE9FC /* CDV.h in Headers */,
 -				30392E4E14F4FCAB00B9E0B8 /* CDVAvailability.h in Headers */,
 -				7E22B88519E4C0210026F95E /* CDVAvailabilityDeprecated.h in Headers */,
 +				30C684941407044B004C1A8E /* CDVURLProtocol.h in Headers */,
 +				8887FD741090FBE7009987E8 /* CDVInvokedUrlCommand.h in Headers */,
 +				30C684801406CB38004C1A8E /* CDVWhitelist.h in Headers */,
  				3034979C1513D56A0090E688 /* CDVLocalStorage.h in Headers */,
 -				3062D120151D0EDB000D9128 /* UIDevice+Extensions.h in Headers */,
 -				EBA3557315ABD38C00F4DE24 /* NSArray+Comparisons.h in Headers */,
 -				EB3B3547161CB44D003DBE7D /* CDVCommandQueue.h in Headers */,
 -				EB3B357C161F2A45003DBE7D /* CDVCommandDelegateImpl.h in Headers */,
 -				1B701028177A61CF00AE11F4 /* CDVShared.h in Headers */,
  				3073E9ED1656D51200957977 /* CDVScreenOrientationDelegate.h in Headers */,
 +				7E14B5A81705050A0032169E /* CDVTimer.h in Headers */,
  				F858FBC6166009A8007DA594 /* CDVConfigParser.h in Headers */,
 -				30F3930B169F839700B22307 /* CDVJSON.h in Headers */,
 -				EBFF4DBD16D3FE2E008F452B /* CDVWebViewDelegate.h in Headers */,
  				EB96673B16A8970A00D86CDF /* CDVUserAgentUtil.h in Headers */,
 -				7E14B5A81705050A0032169E /* CDVTimer.h in Headers */,
 +				EBFF4DBD16D3FE2E008F452B /* CDVWebViewDelegate.h in Headers */,
 +				EB6A98571A77FA430013FCDB /* NSData+Base64.h in Headers */,
  			);
  			runOnlyForDeploymentPostprocessing = 0;
  		};
@@@ -263,7 -369,9 +268,8 @@@
  				EB6A98541A77EE470013FCDB /* CDVJSON_private.m in Sources */,
  				EB3B357D161F2A45003DBE7D /* CDVCommandDelegateImpl.m in Sources */,
  				F858FBC7166009A8007DA594 /* CDVConfigParser.m in Sources */,
 -				30F3930C169F839700B22307 /* CDVJSON.m in Sources */,
  				EB96673C16A8970A00D86CDF /* CDVUserAgentUtil.m in Sources */,
+ 				30E6B8CE1A8ADD900025B9EE /* CDVHandleOpenURL.m in Sources */,
  				EBFF4DBC16D3FE2E008F452B /* CDVWebViewDelegate.m in Sources */,
  				7E14B5A91705050A0032169E /* CDVTimer.m in Sources */,
  			);

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c0085a8c/package.json
----------------------------------------------------------------------
diff --cc package.json
index 52dcd8c,2b330f0..c301d69
--- a/package.json
+++ b/package.json
@@@ -23,5 -24,9 +24,9 @@@
          "shelljs": "^0.2.6",
          "coffee-script": "^1.7.1",
          "nodeunit": "^0.8.7"
+     },
+     "devDependencies": {
+         "jshint": "^2.6.0",
+         "uncrustify": "^0.6.1"
      }
 -}
 +}


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


Mime
View raw message