You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2014/01/28 21:53:35 UTC
git commit: Update to 3.4.0-rc1
Updated Branches:
refs/heads/3.4.x [created] 846d27c1e
Updated Tags: refs/tags/3.4.0-rc1 [created] 846d27c1e
Update to 3.4.0-rc1
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/846d27c1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/846d27c1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/846d27c1
Branch: refs/heads/3.4.x
Commit: 846d27c1e9e188129501de51376ed07854a7aa3b
Parents: 2386d7a
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Jan 28 12:52:27 2014 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Jan 28 12:52:27 2014 -0800
----------------------------------------------------------------------
VERSION | 2 +-
common/www/cordova.js | 57 ++++++++++++++++++++-------------
wp7/template/MyTemplate.vstemplate | 5 ++-
wp8/template/MyTemplate.vstemplate | 4 +--
4 files changed, 39 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/846d27c1/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index df6d3f4..f3c1778 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.4.0-dev
\ No newline at end of file
+3.4.0-rc1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/846d27c1/common/www/cordova.js
----------------------------------------------------------------------
diff --git a/common/www/cordova.js b/common/www/cordova.js
index 6cc106f..6d13961 100644
--- a/common/www/cordova.js
+++ b/common/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: windowsphone
-// 3.4.0-dev-c320378
+// 3.4.0-rc1
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,8 +19,8 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.4.0-dev-c320378';
-// file: lib/scripts/require.js
+var CORDOVA_JS_BUILD_LABEL = '3.4.0-rc1';
+// file: src/scripts/require.js
/*jshint -W079 */
/*jshint -W020 */
@@ -98,7 +98,7 @@ if (typeof module === "object" && typeof require === "function") {
module.exports.define = define;
}
-// file: lib/cordova.js
+// file: src/cordova.js
define("cordova", function(require, exports, module) {
@@ -316,7 +316,7 @@ module.exports = cordova;
});
-// file: lib/common/argscheck.js
+// file: src/common/argscheck.js
define("cordova/argscheck", function(require, exports, module) {
var exec = require('cordova/exec');
@@ -382,7 +382,7 @@ moduleExports.enableChecks = true;
});
-// file: lib/common/base64.js
+// file: src/common/base64.js
define("cordova/base64", function(require, exports, module) {
var base64 = exports;
@@ -438,7 +438,7 @@ function uint8ToBase64(rawData) {
});
-// file: lib/common/builder.js
+// file: src/common/builder.js
define("cordova/builder", function(require, exports, module) {
var utils = require('cordova/utils');
@@ -551,7 +551,7 @@ exports.replaceHookForTesting = function() {};
});
-// file: lib/common/channel.js
+// file: src/common/channel.js
define("cordova/channel", function(require, exports, module) {
var utils = require('cordova/utils'),
@@ -792,10 +792,11 @@ module.exports = channel;
});
-// file: lib/windowsphone/exec.js
+// file: src/windowsphone/exec.js
define("cordova/exec", function(require, exports, module) {
-var cordova = require('cordova');
+var cordova = require('cordova'),
+ base64 = require('cordova/base64');
/**
* Execute a cordova command. It is up to the native side whether this action
@@ -822,6 +823,12 @@ module.exports = function(success, fail, service, action, args) {
// generate a new command string, ex. DebugConsole/log/DebugConsole23/["wtf dude?"]
for(var n = 0; n < args.length; n++)
{
+ // special case for ArrayBuffer which could not be stringified out of the box
+ if(args[n] instanceof ArrayBuffer)
+ {
+ args[n] = base64.fromArrayBuffer(args[n]);
+ }
+
if(typeof args[n] !== "string")
{
args[n] = JSON.stringify(args[n]);
@@ -845,7 +852,7 @@ module.exports = function(success, fail, service, action, args) {
});
-// file: lib/common/exec/proxy.js
+// file: src/common/exec/proxy.js
define("cordova/exec/proxy", function(require, exports, module) {
@@ -875,7 +882,7 @@ module.exports = {
};
});
-// file: lib/common/init.js
+// file: src/common/init.js
define("cordova/init", function(require, exports, module) {
var channel = require('cordova/channel');
@@ -989,7 +996,7 @@ channel.join(function() {
});
-// file: lib/common/modulemapper.js
+// file: src/common/modulemapper.js
define("cordova/modulemapper", function(require, exports, module) {
var builder = require('cordova/builder'),
@@ -1090,7 +1097,7 @@ exports.reset();
});
-// file: lib/windowsphone/platform.js
+// file: src/windowsphone/platform.js
define("cordova/platform", function(require, exports, module) {
module.exports = {
@@ -1109,10 +1116,11 @@ module.exports = {
});
-// file: lib/common/pluginloader.js
+// file: src/common/pluginloader.js
define("cordova/pluginloader", function(require, exports, module) {
var modulemapper = require('cordova/modulemapper');
+var urlutil = require('cordova/urlutil');
// Helper function to inject a <script> tag.
function injectScript(url, onload, onerror) {
@@ -1181,11 +1189,14 @@ function handlePluginsObject(path, moduleList, finishPluginLoading) {
}
function injectPluginScript(pathPrefix, finishPluginLoading) {
- injectScript(pathPrefix + 'cordova_plugins.js', function(){
+ var pluginPath = pathPrefix + 'cordova_plugins.js';
+
+ injectScript(pluginPath, function() {
try {
var moduleList = require("cordova/plugin_list");
handlePluginsObject(pathPrefix, moduleList, finishPluginLoading);
- } catch (e) {
+ }
+ catch (e) {
// Error loading cordova_plugins.js, file not found or something
// this is an acceptable error, pre-3.0.0, so we just move on.
finishPluginLoading();
@@ -1222,24 +1233,24 @@ exports.load = function(callback) {
});
-// file: lib/common/urlutil.js
+// file: src/common/urlutil.js
define("cordova/urlutil", function(require, exports, module) {
-var urlutil = exports;
-var anchorEl = document.createElement('a');
/**
* For already absolute URLs, returns what is passed in.
* For relative URLs, converts them to absolute ones.
*/
-urlutil.makeAbsolute = function(url) {
+exports.makeAbsolute = function makeAbsolute(url) {
+ var anchorEl = document.createElement('a');
anchorEl.href = url;
return anchorEl.href;
};
+
});
-// file: lib/common/utils.js
+// file: src/common/utils.js
define("cordova/utils", function(require, exports, module) {
var utils = exports;
@@ -1410,7 +1421,7 @@ function UUIDcreatePart(length) {
});
window.cordova = require('cordova');
-// file: lib/scripts/bootstrap.js
+// file: src/scripts/bootstrap.js
require('cordova/init');
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/846d27c1/wp7/template/MyTemplate.vstemplate
----------------------------------------------------------------------
diff --git a/wp7/template/MyTemplate.vstemplate b/wp7/template/MyTemplate.vstemplate
index 4d76502..3db87d7 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_4_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_4_0-rc1_</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<LocationField>Enabled</LocationField>
<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
@@ -55,7 +55,6 @@
<ProjectItem ReplaceParameters="true" TargetFileName="CordovaView.xaml">CordovaView.xaml</ProjectItem>
<ProjectItem ReplaceParameters="true" TargetFileName="CordovaView.xaml.cs">CordovaView.xaml.cs</ProjectItem>
<ProjectItem ReplaceParameters="true" TargetFileName="DOMStorageHelper.cs">DOMStorageHelper.cs</ProjectItem>
- <ProjectItem ReplaceParameters="true" TargetFileName="DOMStorageProxy.cs">DOMStorageProxy.cs</ProjectItem>
<ProjectItem ReplaceParameters="true" TargetFileName="IBrowserDecorator.cs">IBrowserDecorator.cs</ProjectItem>
<ProjectItem ReplaceParameters="true" TargetFileName="ImageExifHelper.cs">ImageExifHelper.cs</ProjectItem>
<ProjectItem ReplaceParameters="true" TargetFileName="MimeTypeMapper.cs">MimeTypeMapper.cs</ProjectItem>
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/846d27c1/wp8/template/MyTemplate.vstemplate
----------------------------------------------------------------------
diff --git a/wp8/template/MyTemplate.vstemplate b/wp8/template/MyTemplate.vstemplate
index e78e023..9da0b00 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_4_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.4.0-rc1</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<LocationField>Enabled</LocationField>
<EnableLocationBrowseButton>true</EnableLocationBrowseButton>