cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [50/50] [abbrv] ios commit: [CB-4045] Merge branch '3.0.0' into master
Date Fri, 28 Jun 2013 15:07:58 GMT
[CB-4045] Merge branch '3.0.0' into master


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

Branch: refs/heads/master
Commit: 66aeb901746c292f30742f6eca7a5471d1e9a0d8
Parents: 9e48d82 ce9a0d6
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Fri Jun 28 11:06:37 2013 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Fri Jun 28 11:06:37 2013 -0400

----------------------------------------------------------------------
 CordovaLib/Classes/CDV.h                        |   16 -
 CordovaLib/Classes/CDVAccelerometer.h           |   39 -
 CordovaLib/Classes/CDVAccelerometer.m           |  128 -
 CordovaLib/Classes/CDVBattery.h                 |   40 -
 CordovaLib/Classes/CDVBattery.m                 |  152 -
 CordovaLib/Classes/CDVCamera.h                  |  102 -
 CordovaLib/Classes/CDVCamera.m                  |  730 ---
 CordovaLib/Classes/CDVCapture.h                 |  118 -
 CordovaLib/Classes/CDVCapture.m                 |  845 ---
 CordovaLib/Classes/CDVConnection.h              |   34 -
 CordovaLib/Classes/CDVConnection.m              |  132 -
 CordovaLib/Classes/CDVContact.h                 |  136 -
 CordovaLib/Classes/CDVContact.m                 | 1752 -------
 CordovaLib/Classes/CDVContacts.h                |  151 -
 CordovaLib/Classes/CDVContacts.m                |  593 ---
 CordovaLib/Classes/CDVDevice.h                  |   30 -
 CordovaLib/Classes/CDVDevice.m                  |   89 -
 CordovaLib/Classes/CDVExif.h                    |   43 -
 CordovaLib/Classes/CDVFile.h                    |  107 -
 CordovaLib/Classes/CDVFile.m                    | 1426 ------
 CordovaLib/Classes/CDVFileTransfer.h            |   82 -
 CordovaLib/Classes/CDVFileTransfer.m            |  730 ---
 CordovaLib/Classes/CDVGlobalization.h           |  150 -
 CordovaLib/Classes/CDVGlobalization.m           |  790 ---
 CordovaLib/Classes/CDVInAppBrowser.h            |   89 -
 CordovaLib/Classes/CDVInAppBrowser.m            |  818 ---
 CordovaLib/Classes/CDVJpegHeaderWriter.h        |   62 -
 CordovaLib/Classes/CDVJpegHeaderWriter.m        |  547 --
 CordovaLib/Classes/CDVLocation.h                |  104 -
 CordovaLib/Classes/CDVLocation.m                |  623 ---
 CordovaLib/Classes/CDVNotification.h            |   37 -
 CordovaLib/Classes/CDVNotification.m            |  130 -
 CordovaLib/Classes/CDVReachability.h            |   85 -
 CordovaLib/Classes/CDVReachability.m            |  260 -
 CordovaLib/Classes/CDVShared.h                  |   33 +
 CordovaLib/Classes/CDVShared.m                  |   59 +
 CordovaLib/Classes/CDVSound.h                   |  116 -
 CordovaLib/Classes/CDVSound.m                   |  702 ---
 CordovaLib/Classes/CDVSplashScreen.h            |   33 -
 CordovaLib/Classes/CDVSplashScreen.m            |  230 -
 CordovaLib/Classes/CDVURLProtocol.m             |    7 +-
 CordovaLib/Classes/CDVViewController.m          |    7 +-
 CordovaLib/CordovaLib.xcodeproj/project.pbxproj |  156 +-
 CordovaLib/cordova.js                           | 4816 +-----------------
 .../__TESTING__.xcodeproj/project.pbxproj       |    8 +-
 .../Resources/Capture.bundle/controls_bg.png    |  Bin 955 -> 0 bytes
 .../Resources/Capture.bundle/controls_bg@2x.png |  Bin 971 -> 0 bytes
 .../Capture.bundle/controls_bg@2x~ipad.png      |  Bin 2858 -> 0 bytes
 .../Capture.bundle/controls_bg~ipad.png         |  Bin 969 -> 0 bytes
 .../microphone-568h@2x~iphone.png               |  Bin 531673 -> 0 bytes
 .../Resources/Capture.bundle/microphone.png     |  Bin 72226 -> 0 bytes
 .../Resources/Capture.bundle/microphone@2x.png  |  Bin 282409 -> 0 bytes
 .../Capture.bundle/microphone@2x~ipad.png       |  Bin 911582 -> 0 bytes
 .../Capture.bundle/microphone~ipad.png          |  Bin 393975 -> 0 bytes
 .../Resources/Capture.bundle/record_button.png  |  Bin 5852 -> 0 bytes
 .../Capture.bundle/record_button@2x.png         |  Bin 13875 -> 0 bytes
 .../Capture.bundle/record_button@2x~ipad.png    |  Bin 15822 -> 0 bytes
 .../Capture.bundle/record_button~ipad.png       |  Bin 7547 -> 0 bytes
 .../Resources/Capture.bundle/recording_bg.png   |  Bin 973 -> 0 bytes
 .../Capture.bundle/recording_bg@2x.png          |  Bin 990 -> 0 bytes
 .../Capture.bundle/recording_bg@2x~ipad.png     |  Bin 1026 -> 0 bytes
 .../Capture.bundle/recording_bg~ipad.png        |  Bin 996 -> 0 bytes
 .../Resources/Capture.bundle/stop_button.png    |  Bin 5514 -> 0 bytes
 .../Resources/Capture.bundle/stop_button@2x.png |  Bin 12965 -> 0 bytes
 .../Capture.bundle/stop_button@2x~ipad.png      |  Bin 14474 -> 0 bytes
 .../Capture.bundle/stop_button~ipad.png         |  Bin 7119 -> 0 bytes
 bin/templates/project/__TESTING__/config.xml    |   52 -
 67 files changed, 322 insertions(+), 17067 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/66aeb901/CordovaLib/Classes/CDVShared.h
----------------------------------------------------------------------
diff --cc CordovaLib/Classes/CDVShared.h
index 0000000,0b59a37..c54567a
mode 000000,100644..100644
--- a/CordovaLib/Classes/CDVShared.h
+++ b/CordovaLib/Classes/CDVShared.h
@@@ -1,0 -1,35 +1,33 @@@
+ /*
+  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 <Foundation/Foundation.h>
+ #import <CoreLocation/CoreLocation.h>
+ 
 -
+ @interface NSError (JSONMethods)
+ 
+ - (NSString*)JSONRepresentation;
+ 
+ @end
+ 
+ @interface CLLocation (JSONMethods)
+ 
+ - (NSString*)JSONRepresentation;
+ 
+ @end
 -

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/66aeb901/CordovaLib/Classes/CDVShared.m
----------------------------------------------------------------------
diff --cc CordovaLib/Classes/CDVShared.m
index 0000000,8756c17..0617ece
mode 000000,100644..100644
--- a/CordovaLib/Classes/CDVShared.m
+++ b/CordovaLib/Classes/CDVShared.m
@@@ -1,0 -1,59 +1,59 @@@
+ /*
+  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 "CDVShared.h"
+ 
+ #pragma mark -
+ #pragma mark CLLocation(JSONMethods)
+ 
+ @implementation CLLocation (JSONMethods)
+ 
+ - (NSString*)JSONRepresentation
+ {
+     return [NSString stringWithFormat:
 -            @"{ timestamp: %.00f, \
++           @"{ timestamp: %.00f, \
+             coords: { latitude: %f, longitude: %f, altitude: %.02f, heading: %.02f, speed:
%.02f, accuracy: %.02f, altitudeAccuracy: %.02f } \
+             }",
 -            [self.timestamp timeIntervalSince1970] * 1000.0,
 -            self.coordinate.latitude,
 -            self.coordinate.longitude,
 -            self.altitude,
 -            self.course,
 -            self.speed,
 -            self.horizontalAccuracy,
 -            self.verticalAccuracy
 -            ];
++           [self.timestamp timeIntervalSince1970] * 1000.0,
++           self.coordinate.latitude,
++           self.coordinate.longitude,
++           self.altitude,
++           self.course,
++           self.speed,
++           self.horizontalAccuracy,
++           self.verticalAccuracy
++    ];
+ }
+ 
+ @end
+ 
+ #pragma mark NSError(JSONMethods)
+ 
+ @implementation NSError (JSONMethods)
+ 
+ - (NSString*)JSONRepresentation
+ {
+     return [NSString stringWithFormat:
 -            @"{ code: %d, message: '%@'}",
 -            self.code,
 -            [self localizedDescription]
 -            ];
++           @"{ code: %d, message: '%@'}",
++           self.code,
++           [self localizedDescription]
++    ];
+ }
+ 
 -@end
++@end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/66aeb901/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --cc CordovaLib/Classes/CDVViewController.m
index 94f4552,db79332..f7595f5
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@@ -280,11 -280,7 +280,6 @@@
       * Fire up the GPS Service right away as it takes a moment for data to come back.
       */
  
-     if ([enableLocation boolValue]) {
-         NSLog(@"Deprecated: The 'EnableLocation' boolean property is deprecated in 2.5.0,
and will be removed in 3.0.0. Use the 'onload' boolean attribute (of the CDVLocation plugin.");
-         [[self.commandDelegate getCommandInstance:@"Geolocation"] getLocation:[CDVInvokedUrlCommand
new]];
-     }
--
      if (hideKeyboardFormAccessoryBar) {
          __weak CDVViewController* weakSelf = self;
          [[NSNotificationCenter defaultCenter] addObserverForName:UIKeyboardWillShowNotification

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/66aeb901/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --cc CordovaLib/cordova.js
index fd8aa39,c697796..56705b1
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@@ -1,5 -1,5 +1,5 @@@
  // Platform: ios
- // 2.9.0-0-g83dc4bd
 -// 2.7.0rc1-121-g0903b29
++// 2.7.0rc1-154-g98a62ff
  /*
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@@ -19,7 -19,7 +19,7 @@@
   under the License.
  */
  ;(function() {
- var CORDOVA_JS_BUILD_LABEL = '2.9.0-0-g83dc4bd';
 -var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-121-g0903b29';
++var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-154-g98a62ff';
  // file: lib/scripts/require.js
  
  var require,
@@@ -376,7 -376,7 +376,7 @@@ function checkArgs(spec, functionName, 
      if (errMsg) {
          errMsg += ', but got ' + typeName + '.';
          errMsg = 'Wrong type for parameter "' + extractParamName(opt_callee || args.callee,
i) + '" of ' + functionName + ': ' + errMsg;
--        // Don't log when running jake test.
++        // Don't log when running unit tests.
          if (typeof jasmine == 'undefined') {
              console.error(errMsg);
          }


Mime
View raw message