LumeWeb
/
filer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from humphd/develop 

s/this/that/ in a few spots in fs.js, add myself to AUTHORS
This commit is contained in:
Alan K 2013-11-15 12:02:26 -08:00
parent a02f525a7c 9813886d38
commit 969fbd1e09
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -1 +1,2 @@
Alan K <ack@modeswitch.org> (blog.modeswitch.org) Alan K <ack@modeswitch.org> (blog.modeswitch.org)
David Humphrey <david.humphrey@senecacollege.ca> (@humphd)

6
src/fs.js
View File

@ -897,7 +897,7 @@ define(function(require) {
deferred.reject(new EInvalid('flags is not valid')); deferred.reject(new EInvalid('flags is not valid'));
} }
open_file(this, files, path, flags, check_result); open_file(that, files, path, flags, check_result);
deferred.promise.then( deferred.promise.then(
function(result) { function(result) {
callback(undefined, result); callback(undefined, result);
@ -1201,7 +1201,7 @@ define(function(require) {
deferred.reject(new EInvalid('flags is not valid')); deferred.reject(new EInvalid('flags is not valid'));
} }
open_file(this, files, path, flags, function(err, fileNode) { open_file(that, files, path, flags, function(err, fileNode) {
if(err) { if(err) {
// TODO: abort transaction? // TODO: abort transaction?
return deferred.reject(err); return deferred.reject(err);
@ -1323,7 +1323,7 @@ define(function(require) {
data = new TextEncoder('utf-8').encode(data); data = new TextEncoder('utf-8').encode(data);
} }
open_file(this, files, path, flags, function(err, fileNode) { open_file(that, files, path, flags, function(err, fileNode) {
if(err) { if(err) {
// TODO: abort transaction? // TODO: abort transaction?
return deferred.reject(err); return deferred.reject(err);