merger
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/93a022c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/93a022c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/93a022c4 Branch: refs/heads/master Commit: 93a022c40c43954ec96958149305f0e021d989d5 Parents: a5376f0 58d3798 Author: Jesse MacFadyen <purplecabb...@gmail.com> Authored: Thu Sep 27 17:39:53 2012 -0700 Committer: Jesse MacFadyen <purplecabb...@gmail.com> Committed: Thu Sep 27 17:39:53 2012 -0700 ---------------------------------------------------------------------- lib/scripts/bootstrap-win8metro.js | 1 - lib/scripts/bootstrap-windows8.js | 1 + lib/windows8/exec.js | 37 +- lib/windows8/platform.js | 17 +- lib/windows8/plugin/windows8/CameraProxy.js | 89 +- lib/windows8/plugin/windows8/CaptureProxy.js | 104 ++- lib/windows8/plugin/windows8/FileProxy.js | 755 +++++++++++++++- lib/windows8/plugin/windows8/FileTransferProxy.js | 86 ++ lib/windows8/plugin/windows8/MediaFile.js | 44 - lib/windows8/plugin/windows8/MediaProxy.js | 13 +- lib/windows8/plugin/windows8/NotificationProxy.js | 6 +- lib/windows8/plugin/windows8/geolocation.js | 4 +- 12 files changed, 963 insertions(+), 194 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93a022c4/lib/windows8/exec.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93a022c4/lib/windows8/platform.js ---------------------------------------------------------------------- diff --cc lib/windows8/platform.js index 3c0c798,5d50b9d..972f59b mode 100755,100644..100755 --- a/lib/windows8/platform.js +++ b/lib/windows8/platform.js @@@ -26,12 -31,9 +31,12 @@@ module.exports = } }, merges: { + MediaFile: { + path: "cordova/plugin/windows8/MediaFile" + }, navigator: { children: { - notification: { + geolocation: { path: 'cordova/plugin/windows8/geolocation' } } http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93a022c4/lib/windows8/plugin/windows8/CameraProxy.js ---------------------------------------------------------------------- diff --cc lib/windows8/plugin/windows8/CameraProxy.js index 7f0f5b0,9fbb830..d00126d --- a/lib/windows8/plugin/windows8/CameraProxy.js +++ b/lib/windows8/plugin/windows8/CameraProxy.js @@@ -141,13 -135,16 +135,17 @@@ module.exports = reader.readAsDataURL(filePhoto); - } + }; var failCB = function () { - errorCallback("File not found.") - } + errorCallback("File not found."); + }; fileEntry.file(successCB, failCB); - } + }; + + var fail = function (fileError) { + errorCallback("FileError, code:" + fileError.code); + }; + Windows.Storage.StorageFolder.getFolderFromPathAsync(packageId.path).done(function (storageFolder) { file.copyAsync(storageFolder, file.name, Windows.Storage.NameCollisionOption.replaceExisting).then(function (storageFile) { success(new FileEntry(storageFile.name, storageFile.path)); http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93a022c4/lib/windows8/plugin/windows8/CaptureProxy.js ---------------------------------------------------------------------- diff --cc lib/windows8/plugin/windows8/CaptureProxy.js index 786080f,c39398a..d5f9c5b --- a/lib/windows8/plugin/windows8/CaptureProxy.js +++ b/lib/windows8/plugin/windows8/CaptureProxy.js @@@ -1,5 -1,3 +1,7 @@@ ++ +/*global Windows:true */ + ++ var MediaFile = require('cordova/plugin/MediaFile'); var CaptureError = require('cordova/plugin/CaptureError'); var CaptureAudioOptions = require('cordova/plugin/CaptureAudioOptions'); @@@ -9,16 -7,13 +11,14 @@@ var MediaFileData = require('cordova/pl module.exports = { - // No UI support. The duration of the audio recording. + captureAudio:function(successCallback, errorCallback, args) { + var options = args[0]; + - captureAudio:function(successCallback, errorCallback, options) { - - var cameraCaptureAudioDuration = 1024; - options = options[0]; var audioOptions = new CaptureAudioOptions(); - if (options.duration && options.duration > 0) { + if (typeof(options.duration) == 'undefined') { + audioOptions.duration = 3600; // Arbitrary amount, need to change later + } else if (options.duration > 0) { audioOptions.duration = options.duration; - cameraCaptureAudioDuration = audioOptions.duration; } else { errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT)); return; @@@ -131,7 -134,6 +139,7 @@@ }, function () { errorCallback(new CaptureError(CaptureError.CAPTURE_INVALID_ARGUMENT)); } - ) + ); } - } + }; ++ http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93a022c4/lib/windows8/plugin/windows8/FileProxy.js ---------------------------------------------------------------------- diff --cc lib/windows8/plugin/windows8/FileProxy.js index 13cbbfa,606d53d..71213a8 --- a/lib/windows8/plugin/windows8/FileProxy.js +++ b/lib/windows8/plugin/windows8/FileProxy.js @@@ -1,6 -1,10 +1,12 @@@ +/*global Windows:true */ + +var cordova = require('cordova'); + var Entry = require('cordova/plugin/Entry'), + File = require('cordova/plugin/File'), + FileEntry = require('cordova/plugin/FileEntry'), + FileError = require('cordova/plugin/FileError'), + DirectoryEntry = require('cordova/plugin/DirectoryEntry'), + Flags = require('cordova/plugin/Flags'); -//var cordova = require('cordova'); module.exports = { http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93a022c4/lib/windows8/plugin/windows8/MediaProxy.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93a022c4/lib/windows8/plugin/windows8/NotificationProxy.js ---------------------------------------------------------------------- diff --cc lib/windows8/plugin/windows8/NotificationProxy.js index ffefc11,d39c63c..b04cf66 --- a/lib/windows8/plugin/windows8/NotificationProxy.js +++ b/lib/windows8/plugin/windows8/NotificationProxy.js @@@ -25,7 -23,6 +25,7 @@@ module.exports = var md = new Windows.UI.Popups.MessageDialog(message, _title); var button = _buttonLabels.split(','); - btnList = []; ++ for (var i = 0; i<button.length; i++) { btnList[button[i]] = i+1; md.commands.append(new Windows.UI.Popups.UICommand(button[i],commandHandler)); http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/93a022c4/lib/windows8/plugin/windows8/geolocation.js ----------------------------------------------------------------------
