Skip to content

Commit

Permalink
use 'use strict' in all jsDAV files and fixed some global refs
Browse files Browse the repository at this point in the history
  • Loading branch information
mikedeboer committed Nov 27, 2011
1 parent 185f489 commit 5006231
Show file tree
Hide file tree
Showing 66 changed files with 880 additions and 924 deletions.
13 changes: 6 additions & 7 deletions lib/DAV/directory.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

var jsDAV = require("./../jsdav"),
jsDAV_Node = require("./node").jsDAV_Node,
jsDAV_iCollection = require("./iCollection").jsDAV_iCollection,
var jsDAV = require("./../jsdav");

Exc = require("./exceptions");
var Exc = require("./exceptions");

/**
* Directory class
Expand All @@ -34,9 +33,9 @@ function jsDAV_Directory() {
*/
this.getChild = function(name, cbgetchildabs) {
this.getChildren(function(err, c) {
var child,
i = 0,
l = c.length;
var child;
var i = 0;
var l = c.length;
for (; i < l; ++i) {
child = c[i];
if (child.getName() == name)
Expand Down
16 changes: 8 additions & 8 deletions lib/DAV/exceptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

/**
* Main Exception class.
Expand Down Expand Up @@ -56,14 +57,13 @@ exports.jsDAV_Exception = function(msg, extra) {
this.serialize = function(handler, errorNode) {return errorNode;};

this.toString = function(handler, cbtostring) {
var _self = this,
headers = "";
var self = this;
var headers = "";
if (handler) {
headers = "Headers: ";
this.getHTTPHeaders(handler, function(err, h) {
for (var i in h) {
for (var i in h)
headers += "\t" + i + ": " + h[i] + "\n";
}
afterHeaders();
});
}
Expand All @@ -72,9 +72,9 @@ exports.jsDAV_Exception = function(msg, extra) {
}

function afterHeaders() {
var msg = headers + "HTTP code: " + _self.code + "\n"
+ "Exception type: " + _self.type + "\n"
+ "Message: " + _self.message;
var msg = headers + "HTTP code: " + self.code + "\n"
+ "Exception type: " + self.type + "\n"
+ "Message: " + self.message;
return cbtostring ? cbtostring(null, msg) : msg;
}
};
Expand Down Expand Up @@ -135,7 +135,7 @@ exports.jsDAV_Exception_Locked.prototype = new exports.jsDAV_Exception_Locked();
* was made, on a resource which was already locked
*/
exports.jsDAV_Exception_ConflictingLock = function(lock) {
this.type = message = "jsDAV_Exception_ConflictingLock";
this.type = this.message = "jsDAV_Exception_ConflictingLock";
this.lock = lock;

this.serialize = function(handler, errorNode) {
Expand Down
9 changes: 5 additions & 4 deletions lib/DAV/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

var jsDAV = require("./../jsdav"),
jsDAV_Node = require("./node").jsDAV_Node,
jsDAV_iFile = require("./ifile").jsDAV_iFile,
var jsDAV = require("./../jsdav");
var jsDAV_Node = require("./node").jsDAV_Node;
var jsDAV_iFile = require("./ifile").jsDAV_iFile;

Exc = require("./exceptions");
var Exc = require("./exceptions");

/**
* File class
Expand Down
21 changes: 10 additions & 11 deletions lib/DAV/fs/directory.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

var jsDAV = require("./../../jsdav"),
jsDAV_FS_Node = require("./node").jsDAV_FS_Node,
jsDAV_FS_File = require("./file").jsDAV_FS_File,
jsDAV_Directory = require("./../directory").jsDAV_Directory,
jsDAV_iCollection = require("./../iCollection").jsDAV_iCollection,
jsDAV_iQuota = require("./../iQuota").jsDAV_iQuota,
var jsDAV_FS_Node = require("./node").jsDAV_FS_Node;
var jsDAV_FS_File = require("./file").jsDAV_FS_File;
var jsDAV_Directory = require("./../directory").jsDAV_Directory;
var jsDAV_iCollection = require("./../iCollection").jsDAV_iCollection;
var jsDAV_iQuota = require("./../iQuota").jsDAV_iQuota;

Fs = require("fs"),
Async = require("./../../../support/async.js"),
Exc = require("./../exceptions");
var Fs = require("fs");
var Async = require("./../../../support/async.js");
var Exc = require("./../exceptions");

function jsDAV_FS_Directory(path) {
this.path = path;
Expand Down Expand Up @@ -52,7 +52,7 @@ exports.jsDAV_FS_Directory = jsDAV_FS_Directory;
*/
this.createDirectory = function(name, cbfscreatedir) {
var newPath = this.path + "/" + name;
Fs.mkdir(newPath, 0755, cbfscreatedir);
Fs.mkdir(newPath, "0755", cbfscreatedir);
};

/**
Expand Down Expand Up @@ -120,7 +120,6 @@ exports.jsDAV_FS_Directory = jsDAV_FS_Directory;
this.$statvfs.bavail// * this.$statvfs.bsize
]);
}
var _self = this;
Fs.statvfs(this.path, function(err, statvfs) {
if (err || !statvfs)
cbfsquota(err, [0, 0]);
Expand Down
46 changes: 22 additions & 24 deletions lib/DAV/fs/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

var jsDAV = require("./../../jsdav"),
jsDAV_FS_Node = require("./node").jsDAV_FS_Node,
jsDAV_Directory = require("./../directory").jsDAV_Directory,
jsDAV_iFile = require("./../iFile").jsDAV_iFile,
var jsDAV_FS_Node = require("./node").jsDAV_FS_Node;
var jsDAV_iFile = require("./../iFile").jsDAV_iFile;

Fs = require("fs"),
Exc = require("./../exceptions"),
Util = require("./../util");
var Fs = require("fs");
var Exc = require("./../exceptions");
var Util = require("./../util");

function jsDAV_FS_File(path) {
this.path = path;
Expand Down Expand Up @@ -42,22 +41,22 @@ exports.jsDAV_FS_File = jsDAV_FS_File;
this.get = function(cbfsfileget) {
if (this.$buffer)
return cbfsfileget(null, this.$buffer);
var _self = this,
onRead = function(err, buff) {
if (err)
return cbfsfileget(err);
// For older versions of node convert the string to a buffer.
if (typeof buff === "string") {
var b = new Buffer(buff.length);
b.write(buff, "binary");
buff = b;
}
// Zero length buffers act funny, use a string
if (buff.length === 0)
buff = "";
//_self.$buffer = buff;
cbfsfileget(null, buff);
};
//var _self = this;
var onRead = function(err, buff) {
if (err)
return cbfsfileget(err);
// For older versions of node convert the string to a buffer.
if (typeof buff === "string") {
var b = new Buffer(buff.length);
b.write(buff, "binary");
buff = b;
}
// Zero length buffers act funny, use a string
if (buff.length === 0)
buff = "";
//_self.$buffer = buff;
cbfsfileget(null, buff);
};

// Node before 0.1.95 doesn't do buffers for fs.readFile
if (process.version < "0.1.95" && process.version > "0.1.100") {
Expand Down Expand Up @@ -86,7 +85,6 @@ exports.jsDAV_FS_File = jsDAV_FS_File;
this.getSize = function(cbfsgetsize) {
if (this.$stat)
return cbfsgetsize(null, this.$stat.size);
var _self = this;
return Fs.stat(this.path, function(err, stat) {
if (err || !stat) {
return cbfsgetsize(new Exc.jsDAV_Exception_FileNotFound("File at location "
Expand Down
20 changes: 9 additions & 11 deletions lib/DAV/fs/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

var jsDAV = require("./../../jsdav"),
jsDAV_iNode = require("./../iNode").jsDAV_iNode,
var jsDAV_iNode = require("./../iNode").jsDAV_iNode;

Fs = require("fs"),
Path = require("path"),
Util = require("./../util"),
Exc = require("./../exceptions");
var Fs = require("fs");
var Path = require("path");
var Util = require("./../util");

function jsDAV_FS_Node(path) {
this.path = path;
Expand All @@ -37,15 +36,15 @@ exports.jsDAV_FS_Node = jsDAV_FS_Node;
* @return void
*/
this.setName = function(name, cbfssetname) {
var parentPath = Util.splitPath(this.path)[0],
newName = Util.splitPath(name)[1];
var parentPath = Util.splitPath(this.path)[0];
var newName = Util.splitPath(name)[1];

var newPath = parentPath + "/" + newName;
var _self = this;
var self = this;
Fs.rename(this.path, newPath, function(err) {
if (err)
return cbfssetname(err);
_self.path = newPath;
self.path = newPath;
cbfssetname();
});
};
Expand All @@ -58,7 +57,6 @@ exports.jsDAV_FS_Node = jsDAV_FS_Node;
this.getLastModified = function(cbfsgetlm) {
if (this.$stat)
return cbfsgetlm(null, this.$stat.mtime);
var _self = this;
Fs.stat(this.path, function(err, stat) {
if (err || typeof stat == "undefined")
return cbfsgetlm(err);
Expand Down
2 changes: 1 addition & 1 deletion lib/DAV/ftp/directory.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

var jsDAV = require("./../../jsdav");
var jsDAV_Ftp_Node = require("./node").jsDAV_Ftp_Node;
var jsDAV_Ftp_File = require("./file").jsDAV_Ftp_File;
var jsDAV_Directory = require("./../directory").jsDAV_Directory;
Expand Down
12 changes: 5 additions & 7 deletions lib/DAV/ftp/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

var jsDAV = require("./../../jsdav"),
jsDAV_Ftp_Node = require("./node").jsDAV_Ftp_Node,
jsDAV_Directory = require("./../directory").jsDAV_Directory,
jsDAV_iFile = require("./../iFile").jsDAV_iFile,
var jsDAV_Ftp_Node = require("./node").jsDAV_Ftp_Node;
var jsDAV_iFile = require("./../iFile").jsDAV_iFile;

Fs = require("fs"),
Exc = require("./../exceptions"),
Util = require("./../util");
var Exc = require("./../exceptions");
var Util = require("./../util");

var Path = require("path");

Expand Down
10 changes: 4 additions & 6 deletions lib/DAV/ftp/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
* @author Mike de Boer <info AT mikedeboer DOT nl>
* @license http://github.com/mikedeboer/jsDAV/blob/master/LICENSE MIT License
*/
"use strict";

var jsDAV = require("./../../jsdav");
var jsDAV_iNode = require("./../iNode").jsDAV_iNode;
var jsDAV = require("./../../jsdav");
var jsDAV_iNode = require("./../iNode").jsDAV_iNode;
var jsDav_iProperties = require("./../iProperties").jsDAV_iProperties;

var Fs = require("fs");
var Path = require("path");
var Util = require("./../util");
var Exc = require("./../exceptions");
var Util = require("./../util");

function jsDAV_Ftp_Node(path, ftp) {
this.path = (path || "").replace(/[\/]+$/, "");
Expand Down
Loading

0 comments on commit 5006231

Please sign in to comment.