Skip to content

Commit

Permalink
Merge pull request mozilla#162 from appleifreak/master
Browse files Browse the repository at this point in the history
Implemented chokidar for more robust file system watching
  • Loading branch information
jlongster committed Feb 24, 2014
2 parents 7505f27 + 9ab1e76 commit a8115c7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -4,7 +4,8 @@
"version": "1.0.1", "version": "1.0.1",
"author": "James Long <longster@gmail.com>", "author": "James Long <longster@gmail.com>",
"dependencies": { "dependencies": {
"optimist": "*" "optimist": "*",
"chokidar": "git://github.com/appleifreak/chokidar.git"
}, },
"devDependencies": { "devDependencies": {
"expect.js": "*", "expect.js": "*",
Expand Down
8 changes: 5 additions & 3 deletions src/node-loaders.js
Expand Up @@ -2,6 +2,7 @@ var fs = require('fs');
var path = require('path'); var path = require('path');
var lib = require('./lib'); var lib = require('./lib');
var Loader = require('./loader'); var Loader = require('./loader');
var chokidar = require('chokidar');


// Node <0.7.1 compatibility // Node <0.7.1 compatibility
var existsSync = fs.existsSync || path.existsSync; var existsSync = fs.existsSync || path.existsSync;
Expand All @@ -24,9 +25,10 @@ var FileSystemLoader = Loader.extend({
// they change // they change
lib.each(this.searchPaths, function(p) { lib.each(this.searchPaths, function(p) {
if(existsSync(p)) { if(existsSync(p)) {
fs.watch(p, { persistent: false }, function(event, filename) { var watcher = chokidar.watch(p, { ignoreInitial: true, usePolling: false });
var fullname = path.join(p, filename || '');
if((event == 'change' || event == 'rename') && fullname in this.pathsToNames) { watcher.on("all", function(event, fullname) {
if(event == "change" && fullname in this.pathsToNames) {
this.emit('update', this.pathsToNames[fullname]); this.emit('update', this.pathsToNames[fullname]);
} }
}.bind(this)); }.bind(this));
Expand Down

0 comments on commit a8115c7

Please sign in to comment.