CB-5544 update versions, js for 3.3.0-rc1
diff --git a/VERSION b/VERSION
index 49d2ba3..ee177ba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-dev
\ No newline at end of file
+3.3.0-rc1
\ No newline at end of file
diff --git a/common/www/cordova.js b/common/www/cordova.js
index df0c0ff..033285f 100644
--- a/common/www/cordova.js
+++ b/common/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: windowsphone
-// 3.0.0-dev-56-g579d990
+// 3.3.0-rc1
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,9 +19,12 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.0.0-dev-56-g579d990';
+var CORDOVA_JS_BUILD_LABEL = '3.3.0-rc1';
// file: lib/scripts/require.js
+/*jshint -W079 */
+/*jshint -W020 */
+
var require,
define;
@@ -100,6 +103,7 @@
var channel = require('cordova/channel');
+var platform = require('cordova/platform');
/**
* Intercept calls to addEventListener + removeEventListener and handle deviceready,
@@ -172,6 +176,7 @@
define:define,
require:require,
version:CORDOVA_JS_BUILD_LABEL,
+ platformId:platform.id,
/**
* Methods to add/remove your own addEventListener hijacking on document + window.
*/
@@ -502,7 +507,7 @@
include(result, obj.children, clobber, merge);
}
} catch(e) {
- utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"');
+ utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
}
});
}
@@ -840,6 +845,36 @@
});
+// file: lib/common/exec/proxy.js
+define("cordova/exec/proxy", function(require, exports, module) {
+
+
+// internal map of proxy function
+var CommandProxyMap = {};
+
+module.exports = {
+
+ // example: cordova.commandProxy.add("Accelerometer",{getCurrentAcceleration: function(successCallback, errorCallback, options) {...},...);
+ add:function(id,proxyObj) {
+ console.log("adding proxy for " + id);
+ CommandProxyMap[id] = proxyObj;
+ return proxyObj;
+ },
+
+ // cordova.commandProxy.remove("Accelerometer");
+ remove:function(id) {
+ var proxy = CommandProxyMap[id];
+ delete CommandProxyMap[id];
+ CommandProxyMap[id] = null;
+ return proxy;
+ },
+
+ get:function(service,action) {
+ return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null );
+ }
+};
+});
+
// file: lib/common/init.js
define("cordova/init", function(require, exports, module) {
@@ -1198,8 +1233,8 @@
* For relative URLs, converts them to absolute ones.
*/
urlutil.makeAbsolute = function(url) {
- anchorEl.href = url;
- return anchorEl.href;
+ anchorEl.href = url;
+ return anchorEl.href;
};
});
diff --git a/wp7/template/MyTemplate.vstemplate b/wp7/template/MyTemplate.vstemplate
index 4d76502..6425e2b 100644
--- a/wp7/template/MyTemplate.vstemplate
+++ b/wp7/template/MyTemplate.vstemplate
@@ -1,13 +1,13 @@
<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
<TemplateData>
- <Name>CordovaWP7_3_0_0dev</Name>
+ <Name>CordovaWP7_3_3_0-rc1</Name>
<Description>Starter project for building a Cordova app for Windows Phone version: 3.1.0-rc1</Description>
<ProjectType>CSharp</ProjectType>
<ProjectSubType>
</ProjectSubType>
<SortOrder>1000</SortOrder>
<CreateNewFolder>true</CreateNewFolder>
- <DefaultName>CordovaWP7_3_0_0dev_</DefaultName>
+ <DefaultName>CordovaWP7_3_3_0-rc1_</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<LocationField>Enabled</LocationField>
<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
diff --git a/wp7/template/cordovalib/CordovaView.xaml.cs b/wp7/template/cordovalib/CordovaView.xaml.cs
index 14925f7..7079073 100644
--- a/wp7/template/cordovalib/CordovaView.xaml.cs
+++ b/wp7/template/cordovalib/CordovaView.xaml.cs
@@ -408,7 +408,7 @@
{
CordovaBrowser.InvokeScript("execScript", new string[] { nativeReady });
}
- catch (Exception ex)
+ catch (Exception /*ex*/)
{
Debug.WriteLine("Error calling js to fire nativeReady event. Did you include cordova.js in your html script tag?");
}
diff --git a/wp8/template/MyTemplate.vstemplate b/wp8/template/MyTemplate.vstemplate
index e78e023..36ce506 100644
--- a/wp8/template/MyTemplate.vstemplate
+++ b/wp8/template/MyTemplate.vstemplate
@@ -1,13 +1,13 @@
<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
<TemplateData>
- <Name>CordovaWP8_3_0_0dev</Name>
+ <Name>CordovaWP8_3_3_0-rc1</Name>
<Description>Starter project for building a Cordova app for Windows Phone 8 version: 3.1.0-rc1</Description>
<ProjectType>CSharp</ProjectType>
<ProjectSubType>
</ProjectSubType>
<SortOrder>1000</SortOrder>
<CreateNewFolder>true</CreateNewFolder>
- <DefaultName>CordovaWP8_3.0.0dev</DefaultName>
+ <DefaultName>CordovaWP8_3.3.0-rc1</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<LocationField>Enabled</LocationField>
<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
