Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A92DFD118 for ; Fri, 29 Jun 2012 19:08:25 +0000 (UTC) Received: (qmail 18540 invoked by uid 500); 29 Jun 2012 19:08:25 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 18515 invoked by uid 500); 29 Jun 2012 19:08:25 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 18507 invoked by uid 99); 29 Jun 2012 19:08:25 -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, 29 Jun 2012 19:08:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C5008E00; Fri, 29 Jun 2012 19:08:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/6] wp7 commit: js+path updates for 1.9.0 release Message-Id: <20120629190824.4C5008E00@tyr.zones.apache.org> Date: Fri, 29 Jun 2012 19:08:24 +0000 (UTC) js+path updates for 1.9.0 release Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/commit/c7d9a283 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/tree/c7d9a283 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/diff/c7d9a283 Branch: refs/heads/master Commit: c7d9a2830f6da5a2a54d0482e36c0a367d285962 Parents: f8d313d Author: Jesse MacFadyen Authored: Fri Jun 29 11:50:01 2012 -0700 Committer: Jesse MacFadyen Committed: Fri Jun 29 11:50:01 2012 -0700 ---------------------------------------------------------------------- VERSION | 2 +- cordova-1.9.0.js | 28 +- example/www/cordova-1.9.0.js | 28 +- templates/custom/www/cordova-1.7.0.js | 5097 ------------- templates/custom/www/cordova-1.8.0.js | 5471 -------------- templates/custom/www/cordova-1.9.0.js | 5642 +++++++++++++++ templates/custom/www/index.html | 2 +- templates/description.txt | 2 +- templates/full/www/cordova-1.9.0.js | 28 +- .../SubmissionInfo/ManualTestResults.xml | 54 - .../SubmissionInfo/Settings.xml | 9 - tests/MobileSpecUnitTests/www/cordova-1.9.0.js | 28 +- 12 files changed, 5697 insertions(+), 10694 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/c7d9a283/VERSION ---------------------------------------------------------------------- diff --git a/VERSION b/VERSION index 6ed8c32..f8e233b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9.0rc1 +1.9.0 http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/c7d9a283/cordova-1.9.0.js ---------------------------------------------------------------------- diff --git a/cordova-1.9.0.js b/cordova-1.9.0.js index 72d197c..17817c6 100644 --- a/cordova-1.9.0.js +++ b/cordova-1.9.0.js @@ -1,6 +1,6 @@ -// commit ec02143a7cb86f6e0895f3262af43737ab5403a7 +// commit ec1cc3e911f1e1e3de91f8e9beae7afd54aee58b -// File generated at :: Fri Jun 22 2012 01:05:18 GMT-0700 (Pacific Daylight Time) +// File generated at :: Fri Jun 29 2012 11:35:38 GMT-0700 (Pacific Daylight Time) /* Licensed to the Apache Software Foundation (ASF) under one @@ -1103,9 +1103,6 @@ module.exports = { path: "cordova/plugin/wp7/console" } - }, - FileTransfer: { - path: 'cordova/plugin/wp7/FileTransfer' } }, device:{ @@ -1113,6 +1110,9 @@ module.exports = { }, console:{ path: "cordova/plugin/wp7/console" + }, + FileTransfer: { + path: 'cordova/plugin/wp7/FileTransfer' } } }; @@ -4989,7 +4989,6 @@ var FileTransfer = function() {}; FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) { - console.log("WP7 specific FileTransfer.upload called with options::" + JSON.stringify(options)); // sanity parameter checking if (!filePath || !server) throw new Error("FileTransfer.upload requires filePath and server URL parameters at the minimum."); // check for options @@ -4998,6 +4997,7 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro var mimeType = null; var params = null; var chunkedMode = true; + if (options) { fileKey = options.fileKey; fileName = options.fileName; @@ -5005,14 +5005,14 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro if (options.chunkedMode !== null || typeof options.chunkedMode != "undefined") { chunkedMode = options.chunkedMode; } - if (options.params) { - if(params && typeof params != typeof "") { - var arrParams = []; - for(var v in params) { - arrParams.push(v + "=" + params[v]); - } - params = encodeURIComponent(arrParams.join("&")); + + // if options are specified, and NOT a string already, we will stringify it. + if(options.params && typeof options.params != typeof "") { + var arrParams = []; + for(var v in options.params) { + arrParams.push(v + "=" + options.params[v]); } + params = encodeURI(arrParams.join("&")); } } @@ -5021,8 +5021,6 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro errorCallback(error); }; - console.log("new patames look like this :: " + params); - exec(successCallback, fail, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, trustAllHosts, chunkedMode]); }; http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/c7d9a283/example/www/cordova-1.9.0.js ---------------------------------------------------------------------- diff --git a/example/www/cordova-1.9.0.js b/example/www/cordova-1.9.0.js index 72d197c..17817c6 100644 --- a/example/www/cordova-1.9.0.js +++ b/example/www/cordova-1.9.0.js @@ -1,6 +1,6 @@ -// commit ec02143a7cb86f6e0895f3262af43737ab5403a7 +// commit ec1cc3e911f1e1e3de91f8e9beae7afd54aee58b -// File generated at :: Fri Jun 22 2012 01:05:18 GMT-0700 (Pacific Daylight Time) +// File generated at :: Fri Jun 29 2012 11:35:38 GMT-0700 (Pacific Daylight Time) /* Licensed to the Apache Software Foundation (ASF) under one @@ -1103,9 +1103,6 @@ module.exports = { path: "cordova/plugin/wp7/console" } - }, - FileTransfer: { - path: 'cordova/plugin/wp7/FileTransfer' } }, device:{ @@ -1113,6 +1110,9 @@ module.exports = { }, console:{ path: "cordova/plugin/wp7/console" + }, + FileTransfer: { + path: 'cordova/plugin/wp7/FileTransfer' } } }; @@ -4989,7 +4989,6 @@ var FileTransfer = function() {}; FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) { - console.log("WP7 specific FileTransfer.upload called with options::" + JSON.stringify(options)); // sanity parameter checking if (!filePath || !server) throw new Error("FileTransfer.upload requires filePath and server URL parameters at the minimum."); // check for options @@ -4998,6 +4997,7 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro var mimeType = null; var params = null; var chunkedMode = true; + if (options) { fileKey = options.fileKey; fileName = options.fileName; @@ -5005,14 +5005,14 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro if (options.chunkedMode !== null || typeof options.chunkedMode != "undefined") { chunkedMode = options.chunkedMode; } - if (options.params) { - if(params && typeof params != typeof "") { - var arrParams = []; - for(var v in params) { - arrParams.push(v + "=" + params[v]); - } - params = encodeURIComponent(arrParams.join("&")); + + // if options are specified, and NOT a string already, we will stringify it. + if(options.params && typeof options.params != typeof "") { + var arrParams = []; + for(var v in options.params) { + arrParams.push(v + "=" + options.params[v]); } + params = encodeURI(arrParams.join("&")); } } @@ -5021,8 +5021,6 @@ FileTransfer.prototype.upload = function(filePath, server, successCallback, erro errorCallback(error); }; - console.log("new patames look like this :: " + params); - exec(successCallback, fail, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, trustAllHosts, chunkedMode]); };