You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by gt...@apache.org on 2013/02/27 22:09:56 UTC
[16/31] js commit: Revert "[win8] modulemapper refactor for
commandProxy."
Revert "[win8] modulemapper refactor for commandProxy."
This reverts commit 02677aff6ebe88564184fadef0e857c002e8b5e2.
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/fab071a9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/fab071a9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/fab071a9
Branch: refs/heads/next
Commit: fab071a9e355827bec6d67f014bc9b202064e356
Parents: 6151266
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 21 07:54:30 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 21 07:54:30 2013 -0500
----------------------------------------------------------------------
lib/windows8/platform.js | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/fab071a9/lib/windows8/platform.js
----------------------------------------------------------------------
diff --git a/lib/windows8/platform.js b/lib/windows8/platform.js
index 211e62a..f3626db 100755
--- a/lib/windows8/platform.js
+++ b/lib/windows8/platform.js
@@ -21,8 +21,7 @@
var cordova = require('cordova'),
exec = require('cordova/exec'),
- channel = cordova.require("cordova/channel"),
- modulemapper = require('cordova/modulemapper');
+ channel = cordova.require("cordova/channel");
/*
* Define native implementations ( there is no native layer, so need to make sure the proxies are there )
@@ -32,12 +31,11 @@ modulemapper.loadMatchingModules(/cordova.*\/windows\/.*Proxy$/);
module.exports = {
id: "windows8",
initialize:function() {
+ var modulemapper = require('cordova/modulemapper');
modulemapper.loadMatchingModules(/cordova.*\/plugininit$/);
modulemapper.loadMatchingModules(/cordova.*\/symbols$/);
- modulemapper.clobbers('/cordova/commandProxy', 'cordova.commandProxy');
-
modulemapper.mapModules(window);
var onWinJSReady = function () {
@@ -68,5 +66,15 @@ module.exports = {
else {
onWinJSReady();
}
+ },
+ clobbers: {
+ cordova: {
+ path: 'cordova',
+ children: {
+ commandProxy: {
+ path: 'cordova/commandProxy'
+ }
+ }
+ }
}
};