Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-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 033EEEFC1 for ; Tue, 25 Jun 2013 21:07:18 +0000 (UTC) Received: (qmail 86230 invoked by uid 500); 25 Jun 2013 21:07:12 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 86029 invoked by uid 500); 25 Jun 2013 21:07:12 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 85523 invoked by uid 99); 25 Jun 2013 21:07:11 -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, 25 Jun 2013 21:07:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 326521C441; Tue, 25 Jun 2013 21:07:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org Date: Tue, 25 Jun 2013 21:07:53 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [46/46] git commit: updated refs/heads/1829-User-Experience-Redesign to b7ee0e5 Switch out almond.js to fix loading external urls Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b7ee0e5d Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b7ee0e5d Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b7ee0e5d Branch: refs/heads/1829-User-Experience-Redesign Commit: b7ee0e5dc981c61f5d85fb12a18f9398e941da62 Parents: 6f33961 Author: Russell Branca Authored: Tue Jun 25 14:07:02 2013 -0700 Committer: Russell Branca Committed: Tue Jun 25 14:07:02 2013 -0700 ---------------------------------------------------------------------- src/fauxton/Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b7ee0e5d/src/fauxton/Gruntfile.js ---------------------------------------------------------------------- diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index b76ae24..6cf4e89 100644 --- a/src/fauxton/Gruntfile.js +++ b/src/fauxton/Gruntfile.js @@ -148,13 +148,13 @@ module.exports = function(grunt) { template: templateSettings, - // The concatenate task is used here to merge the almond require/define + // The concatenate task is used here to merge the require.js require/define // shim and the templates into the application code. It's named // dist/debug/require.js, because we want to only load one script file in // index.html. concat: { requirejs: { - src: ["assets/js/libs/almond.js", "dist/debug/templates.js", "dist/debug/require.js"], + src: ["assets/js/libs/require.js", "dist/debug/templates.js", "dist/debug/require.js"], dest: "dist/debug/js/require.js" },