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 B1E7010698 for ; Wed, 5 Jun 2013 22:37:17 +0000 (UTC) Received: (qmail 76502 invoked by uid 500); 5 Jun 2013 22:37:17 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 76446 invoked by uid 500); 5 Jun 2013 22:37:17 -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 76432 invoked by uid 99); 5 Jun 2013 22:37:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jun 2013 22:37:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5505F316808; Wed, 5 Jun 2013 22:37:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lorinbeer@apache.org To: commits@cordova.apache.org Date: Wed, 05 Jun 2013 22:37:17 -0000 Message-Id: <8a493a7e539f4bb79ee611f092882dee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] webworks commit: [CB-3589] 2.8.0 version tagging for BBOS and playbook Updated Branches: refs/heads/2.8.x bbfd495c3 -> 9b8dc59fb refs/heads/master 3e3c4c34c -> ee54174f2 [CB-3589] 2.8.0 version tagging for BBOS and playbook Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/9b8dc59f Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/9b8dc59f Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/9b8dc59f Branch: refs/heads/2.8.x Commit: 9b8dc59fbfac1e68b53a7376fa911f66265ae2e4 Parents: bbfd495 Author: lorinbeer Authored: Wed Jun 5 15:36:47 2013 -0700 Committer: lorinbeer Committed: Wed Jun 5 15:36:47 2013 -0700 ---------------------------------------------------------------------- blackberry/VERSION | 2 +- blackberry/bin/templates/project/www/VERSION | 2 +- .../ext/src/org/apache/cordova/device/Device.java | 2 +- blackberry/javascript/cordova.blackberry.js | 15 ++++++++------- 4 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/9b8dc59f/blackberry/VERSION ---------------------------------------------------------------------- diff --git a/blackberry/VERSION b/blackberry/VERSION index 1277c83..834f262 100644 --- a/blackberry/VERSION +++ b/blackberry/VERSION @@ -1 +1 @@ -2.8.0rc1 +2.8.0 http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/9b8dc59f/blackberry/bin/templates/project/www/VERSION ---------------------------------------------------------------------- diff --git a/blackberry/bin/templates/project/www/VERSION b/blackberry/bin/templates/project/www/VERSION index 1277c83..834f262 100644 --- a/blackberry/bin/templates/project/www/VERSION +++ b/blackberry/bin/templates/project/www/VERSION @@ -1 +1 @@ -2.8.0rc1 +2.8.0 http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/9b8dc59f/blackberry/framework/ext/src/org/apache/cordova/device/Device.java ---------------------------------------------------------------------- diff --git a/blackberry/framework/ext/src/org/apache/cordova/device/Device.java b/blackberry/framework/ext/src/org/apache/cordova/device/Device.java index 3cfaf42..65a7bf5 100644 --- a/blackberry/framework/ext/src/org/apache/cordova/device/Device.java +++ b/blackberry/framework/ext/src/org/apache/cordova/device/Device.java @@ -54,7 +54,7 @@ public final class Device extends Plugin { JSONObject device = new JSONObject(); device.put( FIELD_PLATFORM, "BlackBerry"); device.put( FIELD_UUID, new Integer( DeviceInfo.getDeviceId()) ); - device.put( FIELD_CORDOVA, "2.8.0rc1" ); + device.put( FIELD_CORDOVA, "2.8.0" ); device.put( FIELD_MODEL, new String(DeviceInfo.getDeviceName()) ); device.put( FIELD_NAME, new String(DeviceInfo.getDeviceName()) ); device.put( FIELD_VERSION, new String(DeviceInfo.getSoftwareVersion()) ); http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/9b8dc59f/blackberry/javascript/cordova.blackberry.js ---------------------------------------------------------------------- diff --git a/blackberry/javascript/cordova.blackberry.js b/blackberry/javascript/cordova.blackberry.js index a2eb10b..c53b8af 100644 --- a/blackberry/javascript/cordova.blackberry.js +++ b/blackberry/javascript/cordova.blackberry.js @@ -1,5 +1,5 @@ // Platform: blackberry -// 2.8.0rc1-2-geedbf67 +// 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-2-geedbf67'; +var CORDOVA_JS_BUILD_LABEL = '2.8.0-0-g6208c95'; // file: lib/scripts/require.js var require, @@ -2222,11 +2222,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 = ''; @@ -9660,6 +9656,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];