[Pkg-javascript-commits] [node-static] 133/151: Fixed more merge issues

[Tonnerre Lombard]

This is an automated email from the git hooks/post-receive script.

tonnerre-guest pushed a commit to branch master
in repository node-static.

commit 818f5d6777a0b2580afc07ff1f8e31823a3546ac
Author: thbaja <thbaja at gmail.com>
Date:   Wed Jun 19 15:42:45 2013 +0200

    Fixed more merge issues
---
 lib/node-static.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/node-static.js b/lib/node-static.js
index 51bf3fd..9c77c31 100644
--- a/lib/node-static.js
+++ b/lib/node-static.js
@@ -10,7 +10,7 @@ var fs     = require('fs')
 // Current version
 var version = [0, 6, 9];
 
-this.Server = function (root, options) {
+Server = function (root, options) {
     if (root && (typeof(root) === 'object')) { options = root, root = null }
 
     this.root    = path.resolve(root || '.');
@@ -195,7 +195,7 @@ Server.prototype.serve = function (req, res, callback) {
 /* Check if we should consider sending a gzip version of the file based on the
  * file content type and client's Accept-Encoding header value.
  */
-this.Server.prototype.gzipOk = function(req, contentType) {
+Server.prototype.gzipOk = function(req, contentType) {
     var enable = this.options.gzip;
     if(enable && 
         (typeof enable === 'boolean' || 
@@ -209,7 +209,7 @@ this.Server.prototype.gzipOk = function(req, contentType) {
 /* Send a gzipped version of the file if the options and the client indicate gzip is enabled and
  * we find a .gz file mathing the static resource requested. 
  */
-this.Server.prototype.respondGzip = function(pathname, status, contentType, _headers, files, stat, req, res, finish) {
+Server.prototype.respondGzip = function(pathname, status, contentType, _headers, files, stat, req, res, finish) {
     var that = this;
     if(files.length == 1 && this.gzipOk(req)) {
         var gzFile = files[0] + ".gz";
@@ -232,7 +232,7 @@ this.Server.prototype.respondGzip = function(pathname, status, contentType, _hea
     }
 }
 
-this.Server.prototype.respondNoGzip = function (pathname, status, contentType, _headers, files, stat, req, res, finish) {
+Server.prototype.respondNoGzip = function (pathname, status, contentType, _headers, files, stat, req, res, finish) {
     var mtime   = Date.parse(stat.mtime),
         key     = pathname || files[0],
         headers = {};
@@ -278,7 +278,7 @@ this.Server.prototype.respondNoGzip = function (pathname, status, contentType, _
     }
 };
 
-this.Server.prototype.respond = function (pathname, status, _headers, files, stat, req, res, finish) {
+Server.prototype.respond = function (pathname, status, _headers, files, stat, req, res, finish) {
     var contentType = _headers['Content-Type'] || 
                       mime.contentTypes[path.extname(files[0]).slice(1)] ||
                       'application/octet-stream';
@@ -289,7 +289,7 @@ this.Server.prototype.respond = function (pathname, status, _headers, files, sta
     }
 }
 
-this.Server.prototype.stream = function (pathname, files, buffer, res, callback) {
+Server.prototype.stream = function (pathname, files, buffer, res, callback) {
     (function streamFile(files, offset) {
         var file = files.shift();
 
@@ -320,9 +320,6 @@ this.Server.prototype.stream = function (pathname, files, buffer, res, callback)
 exports.Server       = Server;
 exports.version      = version;
 exports.mime         = mime;
-exports.store        = store;
-exports.indexStore   = indexStore;
-
 
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-static.git