You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/06/28 17:07:37 UTC
[29/50] [abbrv] ios commit: updated cordovajs
updated cordovajs
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/48f3dd92
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/48f3dd92
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/48f3dd92
Branch: refs/heads/master
Commit: 48f3dd926ff47d02126dd386300db241e1a2d9fe
Parents: 9586f94
Author: Steven Gill <st...@gmail.com>
Authored: Thu Jun 13 15:56:37 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Jun 20 14:30:53 2013 -0700
----------------------------------------------------------------------
CordovaLib/cordova.js | 62 ++++++----------------------------------------
1 file changed, 8 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/48f3dd92/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index 1c33e04..e8bc477 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -2,6 +2,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
// 2.9.0rc1-0-g002f33d
=======
// 2.7.0rc1-84-g62c5786
@@ -12,6 +13,9 @@
=======
// 2.7.0rc1-101-gc6482ac
>>>>>>> updated js
+=======
+// 2.7.0rc1-116-gf0108ae
+>>>>>>> updated cordovajs
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -34,6 +38,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
var CORDOVA_JS_BUILD_LABEL = '2.9.0rc1-0-g002f33d';
=======
var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-84-g62c5786';
@@ -44,6 +49,9 @@ var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-100-g6a53312';
=======
var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-101-gc6482ac';
>>>>>>> updated js
+=======
+var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-116-gf0108ae';
+>>>>>>> updated cordovajs
// file: lib/scripts/require.js
var require,
@@ -1283,60 +1291,6 @@ module.exports = {
});
-// file: lib/common/plugin/Coordinates.js
-define("cordova/plugin/Coordinates", function(require, exports, module) {
-
-/**
- * This class contains position information.
- * @param {Object} lat
- * @param {Object} lng
- * @param {Object} alt
- * @param {Object} acc
- * @param {Object} head
- * @param {Object} vel
- * @param {Object} altacc
- * @constructor
- */
-var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
- /**
- * The latitude of the position.
- */
- this.latitude = lat;
- /**
- * The longitude of the position,
- */
- this.longitude = lng;
- /**
- * The accuracy of the position.
- */
- this.accuracy = acc;
- /**
- * The altitude of the position.
- */
- this.altitude = (alt !== undefined ? alt : null);
- /**
- * The direction the device is moving at the position.
- */
- this.heading = (head !== undefined ? head : null);
- /**
- * The velocity with which the device is moving at the position.
- */
- this.speed = (vel !== undefined ? vel : null);
-
- if (this.speed === 0 || this.speed === null) {
- this.heading = NaN;
- }
-
- /**
- * The altitude accuracy of the position.
- */
- this.altitudeAccuracy = (altacc !== undefined) ? altacc : null;
-};
-
-module.exports = Coordinates;
-
-});
-
// file: lib/common/plugin/DirectoryEntry.js
define("cordova/plugin/DirectoryEntry", function(require, exports, module) {