Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8149B1041F for ; Fri, 7 Jun 2013 01:09:52 +0000 (UTC) Received: (qmail 82019 invoked by uid 500); 7 Jun 2013 01:09:52 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 82000 invoked by uid 500); 7 Jun 2013 01:09:52 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 81993 invoked by uid 99); 7 Jun 2013 01:09:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 01:09:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 22A0F813ED6; Fri, 7 Jun 2013 01:09:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: filmaj@apache.org To: commits@cordova.apache.org Message-Id: <262aadd0ad054e2ebd1c8f68f0c7c45f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: npm version 2.8.12. Updated cordova-ios library to 2.8.0 tag. Date: Fri, 7 Jun 2013 01:09:52 +0000 (UTC) Updated Branches: refs/heads/master2 f23c68b17 -> da2fab0f9 npm version 2.8.12. Updated cordova-ios library to 2.8.0 tag. Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/da2fab0f Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/da2fab0f Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/da2fab0f Branch: refs/heads/master2 Commit: da2fab0f92d3e681d432297f22bbcb85c9b77afe Parents: f23c68b Author: Fil Maj Authored: Thu Jun 6 18:09:44 2013 -0700 Committer: Fil Maj Committed: Thu Jun 6 18:09:44 2013 -0700 ---------------------------------------------------------------------- lib/cordova-ios/CordovaLib/VERSION | 2 +- lib/cordova-ios/CordovaLib/cordova.js | 17 ++++++++--------- package.json | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/da2fab0f/lib/cordova-ios/CordovaLib/VERSION ---------------------------------------------------------------------- diff --git a/lib/cordova-ios/CordovaLib/VERSION b/lib/cordova-ios/CordovaLib/VERSION index 1277c83..834f262 100644 --- a/lib/cordova-ios/CordovaLib/VERSION +++ b/lib/cordova-ios/CordovaLib/VERSION @@ -1 +1 @@ -2.8.0rc1 +2.8.0 http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/da2fab0f/lib/cordova-ios/CordovaLib/cordova.js ---------------------------------------------------------------------- diff --git a/lib/cordova-ios/CordovaLib/cordova.js b/lib/cordova-ios/CordovaLib/cordova.js index f48d6f9..0dc412a 100644 --- a/lib/cordova-ios/CordovaLib/cordova.js +++ b/lib/cordova-ios/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]; http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/da2fab0f/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index fde2ff7..f7f781e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova", - "version": "2.8.11", + "version": "2.8.12", "preferGlobal": "true", "description": "Cordova command line interface tool", "main": "cordova",