[CB-3589] 2.8.0 version tagging for BBOS and playbook
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
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
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 @@
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()) );
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 @@
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 @@
// 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];
