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 345DEEA0B for ; Tue, 12 Feb 2013 19:33:08 +0000 (UTC) Received: (qmail 61553 invoked by uid 500); 12 Feb 2013 19:33:07 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 61498 invoked by uid 500); 12 Feb 2013 19:33:07 -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 61459 invoked by uid 99); 12 Feb 2013 19:33:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Feb 2013 19:33:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 230CF51659; Tue, 12 Feb 2013 19:33:07 +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: [49/50] js commit: [all] Remove remaining usage of builder. Message-Id: <20130212193307.230CF51659@tyr.zones.apache.org> Date: Tue, 12 Feb 2013 19:33:07 +0000 (UTC) [all] Remove remaining usage of builder. https://issues.apache.org/jira/browse/CB-2227 Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/35e8eb1f Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/35e8eb1f Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/35e8eb1f Branch: refs/heads/symbolmapping Commit: 35e8eb1f102010b5db3bb18b7f9c49fba9cb3f9e Parents: 93b99ce Author: Andrew Grieve Authored: Fri Jan 25 16:03:19 2013 -0500 Committer: Andrew Grieve Committed: Tue Feb 12 14:24:34 2013 -0500 ---------------------------------------------------------------------- lib/scripts/bootstrap.js | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/35e8eb1f/lib/scripts/bootstrap.js ---------------------------------------------------------------------- diff --git a/lib/scripts/bootstrap.js b/lib/scripts/bootstrap.js index 45c70aa..4206c60 100644 --- a/lib/scripts/bootstrap.js +++ b/lib/scripts/bootstrap.js @@ -35,12 +35,7 @@ * Create all cordova objects once page has fully loaded and native side is ready. */ channel.join(function() { - var builder = require('cordova/builder'), - platform = require('cordova/platform'); - - builder.buildIntoButDoNotClobber(platform.defaults, context); - builder.buildIntoAndClobber(platform.clobbers, context); - builder.buildIntoAndMerge(platform.merges, context); + var platform = require('cordova/platform'); // Call the platform-specific initialization platform.initialize();