Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD684EF42 for ; Thu, 21 Feb 2013 12:58:16 +0000 (UTC) Received: (qmail 63825 invoked by uid 500); 21 Feb 2013 12:58:16 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 63762 invoked by uid 500); 21 Feb 2013 12:58:16 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 63484 invoked by uid 99); 21 Feb 2013 12:58:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Feb 2013 12:58:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 965DB82DC60; Thu, 21 Feb 2013 12:58:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [4/9] js commit: [win8] modulemapper refactor for commandProxy. Message-Id: <20130221125815.965DB82DC60@tyr.zones.apache.org> Date: Thu, 21 Feb 2013 12:58:15 +0000 (UTC) [win8] modulemapper refactor for commandProxy. Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/6174c139 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/6174c139 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/6174c139 Branch: refs/heads/cb2227 Commit: 6174c139a3e100dfa4f166eb46fd35e077efdd16 Parents: b045f29 Author: Andrew Grieve Authored: Thu Feb 21 07:57:24 2013 -0500 Committer: Andrew Grieve Committed: Thu Feb 21 07:57:24 2013 -0500 ---------------------------------------------------------------------- lib/windows8/platform.js | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/6174c139/lib/windows8/platform.js ---------------------------------------------------------------------- diff --git a/lib/windows8/platform.js b/lib/windows8/platform.js index f3626db..211e62a 100755 --- a/lib/windows8/platform.js +++ b/lib/windows8/platform.js @@ -21,7 +21,8 @@ var cordova = require('cordova'), exec = require('cordova/exec'), - channel = cordova.require("cordova/channel"); + channel = cordova.require("cordova/channel"), + modulemapper = require('cordova/modulemapper'); /* * Define native implementations ( there is no native layer, so need to make sure the proxies are there ) @@ -31,11 +32,12 @@ 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 () { @@ -66,15 +68,5 @@ module.exports = { else { onWinJSReady(); } - }, - clobbers: { - cordova: { - path: 'cordova', - children: { - commandProxy: { - path: 'cordova/commandProxy' - } - } - } } };