Updated Branches: refs/heads/master 19b4203af -> 3cd1e8438
resolve conflict 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/3cd1e843 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/3cd1e843 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/3cd1e843 Branch: refs/heads/master Commit: 3cd1e8438d90f1fb72ae6eac45d0dac3b0f6c6f6 Parents: 19b4203 9e925b2 Author: Jesse MacFadyen <purplecabb...@gmail.com> Authored: Fri Aug 17 11:50:13 2012 -0700 Committer: Jesse MacFadyen <purplecabb...@gmail.com> Committed: Fri Aug 17 11:50:13 2012 -0700 ---------------------------------------------------------------------- lib/win8metro/exec.js | 4 +- lib/win8metro/platform.js | 13 + lib/win8metro/plugin/win8metro/CameraProxy.js | 712 +++++++-------- lib/win8metro/plugin/win8metro/CaptureProxy.js | 229 +++--- lib/win8metro/plugin/win8metro/MediaFile.js | 42 + lib/win8metro/plugin/win8metro/MediaFileProxy.js | 82 -- lib/win8metro/plugin/win8metro/MediaProxy.js | 47 +- .../plugin/win8metro/NotificationProxy.js | 60 ++ lib/win8metro/plugin/win8metro/geolocation.js | 89 ++ 9 files changed, 675 insertions(+), 603 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/3cd1e843/lib/win8metro/exec.js ---------------------------------------------------------------------- diff --cc lib/win8metro/exec.js index a7c62d4,e05c1e7..bc20a2b --- a/lib/win8metro/exec.js +++ b/lib/win8metro/exec.js @@@ -34,11 -34,11 +34,11 @@@ var CommandProxy = "Device":require('cordova/plugin/win8metro/DeviceProxy'), "File":require('cordova/plugin/win8metro/FileProxy'), "Media":require('cordova/plugin/win8metro/MediaProxy'), - "MediaFile":require('cordova/plugin/win8metro/MediaFileProxy'), - "NetworkStatus":require('cordova/plugin/win8metro/NetworkStatusProxy') + "NetworkStatus":require('cordova/plugin/win8metro/NetworkStatusProxy'), + "Notification":require('cordova/plugin/win8metro/NotificationProxy') }; -var Exec = function(success, fail, service, action, args) { +module.exports = function(success, fail, service, action, args) { if(CommandProxy[service] && CommandProxy[service][action]) { http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/3cd1e843/lib/win8metro/platform.js ---------------------------------------------------------------------- diff --cc lib/win8metro/platform.js index a10294b,70933e1..c5a91b5 mode 100644,100755..100644 --- a/lib/win8metro/platform.js +++ b/lib/win8metro/platform.js @@@ -1,27 -1,67 +1,40 @@@ -var cordova = require('cordova'), - exec = require('cordova/exec'), - channel = cordova.require("cordova/channel"); - -module.exports = { - id: "win8metro", - initialize:function() { - - console.log("win8metro initialize"); - //window.alert = require("cordova/plugin/notification").alert; - - // INject a lsitener for the backbutton, and tell native to override the flag (true/false) when we have 1 or more, or 0, listeners - // var backButtonChannel = cordova.addDocumentEventHandler('backbutton', { - // onSubscribe:function() { - // if (this.numHandlers === 1) { - // exec(null, null, "CoreEvents", "overridebackbutton", [true]); - // } - // }, - // onUnsubscribe:function() { - // if (this.numHandlers === 0) { - // exec(null, null, "CoreEvents", "overridebackbutton", [false]); - // } - // } - // }); - - }, - objects: { - navigator: { - children: { - device: { - path:"cordova/plugin/win8metro/device", - children:{ - capture:{ - path:"cordova/plugin/capture" - } - } - }, - console: { - path: "cordova/plugin/win8metro/console" - - } - } - - } - //, - // device:{ - // path:"cordova/plugin/win8metro/device" - // } - // , - // console:{ - // path: "cordova/plugin/win8metro/console" - // } - }, - - merges: { - MediaFile: { - path: "cordova/plugin/win8metro/MediaFile" - }, - navigator: { - children: { - notification: { - path: 'cordova/plugin/win8metro/geolocation' - } - } - } - } -}; ++ +var cordova = require('cordova'), + exec = require('cordova/exec'), + channel = cordova.require("cordova/channel"); + +module.exports = { + id: "win8metro", + initialize:function() { + + }, + objects: { + navigator: { + children: { + device: { + path:"cordova/plugin/win8metro/device", + children:{ + capture:{ + path:"cordova/plugin/capture" + } + } + }, + console: { + path: "cordova/plugin/win8metro/console" + } + } + } ++ }, ++ merges: { ++ MediaFile: { ++ path: "cordova/plugin/win8metro/MediaFile" ++ }, ++ navigator: { ++ children: { ++ notification: { ++ path: 'cordova/plugin/win8metro/geolocation' ++ } ++ } ++ } + } +};
