Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 11543 invoked from network); 17 Apr 2011 12:54:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Apr 2011 12:54:20 -0000 Received: (qmail 77472 invoked by uid 500); 17 Apr 2011 12:54:20 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 77426 invoked by uid 500); 17 Apr 2011 12:54:20 -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 77415 invoked by uid 99); 17 Apr 2011 12:54:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Apr 2011 12:54:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Apr 2011 12:54:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 432CA2388A66; Sun, 17 Apr 2011 12:53:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1094140 - in /couchdb/branches/1.1.x: THANKS share/server/render.js Date: Sun, 17 Apr 2011 12:53:59 -0000 To: commits@couchdb.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110417125359.432CA2388A66@eris.apache.org> Author: jan Date: Sun Apr 17 12:53:58 2011 New Revision: 1094140 URL: http://svn.apache.org/viewvc?rev=1094140&view=rev Log: Make this reference ddoc in provides() functions In show and list functions in the Javascript query server, the this member is a reference to the design doc object. The same should be true in the functions registered by Mime.provides(), for consistency. Closes COUCHDB-959 Patch by Tim Smith. Modified: couchdb/branches/1.1.x/THANKS couchdb/branches/1.1.x/share/server/render.js Modified: couchdb/branches/1.1.x/THANKS URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/THANKS?rev=1094140&r1=1094139&r2=1094140&view=diff ============================================================================== --- couchdb/branches/1.1.x/THANKS (original) +++ couchdb/branches/1.1.x/THANKS Sun Apr 17 12:53:58 2011 @@ -76,5 +76,6 @@ suggesting improvements or submitting ch * Gabriel Farrell * Mike Leddy * Felix Hummel + * Tim Smith For a list of authors see the `AUTHORS` file. Modified: couchdb/branches/1.1.x/share/server/render.js URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/share/server/render.js?rev=1094140&r1=1094139&r2=1094140&view=diff ============================================================================== --- couchdb/branches/1.1.x/share/server/render.js (original) +++ couchdb/branches/1.1.x/share/server/render.js Sun Apr 17 12:53:58 2011 @@ -72,7 +72,7 @@ var Mime = (function() { Mime.responseContentType = null; }; - function runProvides(req) { + function runProvides(req, ddoc) { var supportedMimes = [], bestFun, bestKey = null, accept = req.headers["Accept"]; if (req.query && req.query.format) { bestKey = req.query.format; @@ -103,7 +103,7 @@ var Mime = (function() { }; if (bestFun) { - return bestFun(); + return bestFun.call(ddoc); } else { var supportedTypes = mimeFuns.map(function(mf) {return mimesByKey[mf[0]].join(', ') || mf[0]}); throw(["error","not_acceptable", @@ -233,7 +233,7 @@ var Render = (function() { } if (Mime.providesUsed) { - resp = Mime.runProvides(args[1]); + resp = Mime.runProvides(args[1], ddoc); resp = applyContentType(maybeWrapResponse(resp), Mime.responseContentType); } @@ -287,7 +287,7 @@ var Render = (function() { var tail = listFun.apply(ddoc, args); if (Mime.providesUsed) { - tail = Mime.runProvides(req); + tail = Mime.runProvides(req, ddoc); } if (!gotRow) getRow(); if (typeof tail != "undefined") {