You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/06/07 01:52:09 UTC
ios commit: Updated cordova.js to 2.8.0 final
Updated Branches:
refs/heads/2.8.x ab8105d71 -> f93f7a5ba
Updated cordova.js to 2.8.0 final
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/f93f7a5b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/f93f7a5b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/f93f7a5b
Branch: refs/heads/2.8.x
Commit: f93f7a5bad8b7f9d141852c8b1f369a262f0389e
Parents: ab8105d
Author: Shazron Abdullah <sh...@apache.org>
Authored: Thu Jun 6 16:52:17 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu Jun 6 16:52:17 2013 -0700
----------------------------------------------------------------------
CordovaLib/cordova.js | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f93f7a5b/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index f48d6f9..0dc412a 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -1,5 +1,5 @@
// Platform: ios
-// 2.8.0rc1-0-g22bc4d8
+// 2.8.0-0-g6208c95
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '2.8.0rc1-0-g22bc4d8';
+var CORDOVA_JS_BUILD_LABEL = '2.8.0-0-g6208c95';
// file: lib/scripts/require.js
var require,
@@ -2383,11 +2383,7 @@ function initRead(reader, file) {
reader._error = null;
reader._readyState = FileReader.LOADING;
- if (typeof file == 'string') {
- // Deprecated in Cordova 2.4.
- console.warn('Using a string argument with FileReader.readAs functions is deprecated.');
- reader._fileName = file;
- } else if (typeof file.fullPath == 'string') {
+ if (typeof file.fullPath == 'string') {
reader._fileName = file.fullPath;
} else {
reader._fileName = '';
@@ -4502,7 +4498,6 @@ function Device() {
this.available = false;
this.platform = null;
this.version = null;
- this.name = null;
this.uuid = null;
this.cordova = null;
this.model = null;
@@ -4518,7 +4513,6 @@ function Device() {
me.available = true;
me.platform = info.platform;
me.version = info.version;
- me.name = info.name;
me.uuid = info.uuid;
me.cordova = buildLabel;
me.model = info.model;
@@ -6259,6 +6253,11 @@ window.cordova = require('cordova');
// file: lib/scripts/bootstrap.js
(function (context) {
+ if (context._cordovaJsLoaded) {
+ throw new Error('cordova.js included multiple times.');
+ }
+ context._cordovaJsLoaded = true;
+
var channel = require('cordova/channel');
var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady];