Merge stable

This commit is contained in:
Thomas Reynolds 2015-04-26 11:32:47 -07:00
commit 2403fa2d81
17 changed files with 184 additions and 15 deletions

View file

@ -128,7 +128,11 @@ module Middleman
def listen!
return if @disable_watcher || @listener || @waiting_for_existence
config = { force_polling: @force_polling }
config = {
force_polling: @force_polling,
wait_for_delay: 0.5
}
config[:latency] = @latency if @latency
@listener = ::Listen.to(@directory.to_s, config, &method(:on_listener_change))