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 D476A10E23 for ; Mon, 9 Sep 2013 20:15:09 +0000 (UTC) Received: (qmail 28680 invoked by uid 500); 9 Sep 2013 20:15:09 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 28462 invoked by uid 500); 9 Sep 2013 20:15:07 -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 28307 invoked by uid 99); 9 Sep 2013 20:15:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 20:15:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 12984825329; Mon, 9 Sep 2013 20:15:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: deathbear@apache.org To: commits@couchdb.apache.org Date: Mon, 09 Sep 2013 20:15:06 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: updated refs/heads/1807-Replication to e0e3858 fix addon template, s/route/routes/.js Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6f72ac9f Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6f72ac9f Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6f72ac9f Branch: refs/heads/1807-Replication Commit: 6f72ac9fc9b9ef918a625389b9e521ad9fbc7621 Parents: 31b9613 Author: Jan Lehnardt Authored: Mon Sep 9 11:12:36 2013 +0200 Committer: Jan Lehnardt Committed: Mon Sep 9 11:13:37 2013 +0200 ---------------------------------------------------------------------- src/fauxton/tasks/addon/rename.json | 2 +- .../tasks/addon/root/route.js.underscore | 21 -------------------- .../tasks/addon/root/routes.js.underscore | 21 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f72ac9f/src/fauxton/tasks/addon/rename.json ---------------------------------------------------------------------- diff --git a/src/fauxton/tasks/addon/rename.json b/src/fauxton/tasks/addon/rename.json index 1f326e9..046ca50 100644 --- a/src/fauxton/tasks/addon/rename.json +++ b/src/fauxton/tasks/addon/rename.json @@ -1,5 +1,5 @@ { - "route.js.underscore": "{%= path %}/{%= name.toLowerCase() %}/route.js", + "routes.js.underscore": "{%= path %}/{%= name.toLowerCase() %}/routes.js", "resources.js.underscore": "{%= path %}/{%= name.toLowerCase() %}/resources.js", "base.js.underscore": "{%= path %}/{%= name.toLowerCase() %}/base.js" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f72ac9f/src/fauxton/tasks/addon/root/route.js.underscore ---------------------------------------------------------------------- diff --git a/src/fauxton/tasks/addon/root/route.js.underscore b/src/fauxton/tasks/addon/root/route.js.underscore deleted file mode 100644 index 859e5bb..0000000 --- a/src/fauxton/tasks/addon/root/route.js.underscore +++ /dev/null @@ -1,21 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); you may not -// use this file except in compliance with the License. You may obtain a copy of -// the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -// License for the specific language governing permissions and limitations under -// the License. - -define([ - "app", - "api", - "addons/{%= name.toLowerCase() %}/resources" -], -function(app, FauxtonAPI, {%= name %}) { - {%= name %}.Routes = {}; - return {%= name %}; -}); http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f72ac9f/src/fauxton/tasks/addon/root/routes.js.underscore ---------------------------------------------------------------------- diff --git a/src/fauxton/tasks/addon/root/routes.js.underscore b/src/fauxton/tasks/addon/root/routes.js.underscore new file mode 100644 index 0000000..859e5bb --- /dev/null +++ b/src/fauxton/tasks/addon/root/routes.js.underscore @@ -0,0 +1,21 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy of +// the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. + +define([ + "app", + "api", + "addons/{%= name.toLowerCase() %}/resources" +], +function(app, FauxtonAPI, {%= name %}) { + {%= name %}.Routes = {}; + return {%= name %}; +});