Follow-up fix for issue #235, deal with '/' when adding trailing slash
This commit is contained in:
parent
fc3380c6bb
commit
08f037ce53
|
@ -10,11 +10,12 @@ function FSWatcher() {
|
||||||
EventEmitter.call(this);
|
EventEmitter.call(this);
|
||||||
var self = this;
|
var self = this;
|
||||||
var recursive = false;
|
var recursive = false;
|
||||||
|
var recursivePathPrefix;
|
||||||
var filename;
|
var filename;
|
||||||
|
|
||||||
function onchange(path) {
|
function onchange(path) {
|
||||||
// Watch for exact filename, or parent path when recursive is true
|
// Watch for exact filename, or parent path when recursive is true.
|
||||||
if(filename === path || (recursive && path.indexOf(filename + '/') === 0)) {
|
if(filename === path || (recursive && path.indexOf(recursivePathPrefix) === 0)) {
|
||||||
self.trigger('change', 'change', path);
|
self.trigger('change', 'change', path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,6 +39,12 @@ function FSWatcher() {
|
||||||
|
|
||||||
// Whether to watch beneath this path or not
|
// Whether to watch beneath this path or not
|
||||||
recursive = recursive_ === true;
|
recursive = recursive_ === true;
|
||||||
|
// If recursive, construct a path prefix portion for comparisons later
|
||||||
|
// (i.e., '/path' becomes '/path/' so we can search within a filename for the
|
||||||
|
// prefix). We also take care to allow for '/' on its own.
|
||||||
|
if(recursive) {
|
||||||
|
recursivePathPrefix = filename === '/' ? '/' : filename + '/';
|
||||||
|
}
|
||||||
|
|
||||||
var intercom = Intercom.getInstance();
|
var intercom = Intercom.getInstance();
|
||||||
intercom.on('change', onchange);
|
intercom.on('change', onchange);
|
||||||
|
|
Loading…
Reference in New Issue