cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject mac commit: Updated cordova.js to 2.8.0 final
Date Thu, 06 Jun 2013 23:54:50 GMT
Updated Branches:
  refs/heads/2.8.x 462eba0b1 -> f025cc061


Updated cordova.js to 2.8.0 final


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

Branch: refs/heads/2.8.x
Commit: f025cc06165a9aec9d7bccddd9ae03b3fbf8e4ab
Parents: 462eba0
Author: Shazron Abdullah <shazron@apache.org>
Authored: Thu Jun 6 16:54:55 2013 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Thu Jun 6 16:54:55 2013 -0700

----------------------------------------------------------------------
 CordovaFramework/cordova.js |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/f025cc06/CordovaFramework/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaFramework/cordova.js b/CordovaFramework/cordova.js
index 57f8186..a3b721a 100644
--- a/CordovaFramework/cordova.js
+++ b/CordovaFramework/cordova.js
@@ -1,5 +1,5 @@
 // Platform: osx
-// 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,
@@ -2251,11 +2251,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 = '';
@@ -4370,7 +4366,6 @@ function Device() {
     this.available = false;
     this.platform = null;
     this.version = null;
-    this.name = null;
     this.uuid = null;
     this.cordova = null;
     this.model = null;
@@ -4386,7 +4381,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;
@@ -5962,6 +5956,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];
 


Mime
View raw message