Fixes #13, watch means dev mode

Though, we probably still want serving
moshen · Jun 16, 2013 · 34e9eef · 34e9eef
1 parent 9174ea3
commit 34e9eef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -219,7 +219,7 @@ no bundles are created and all the referenced files are
 included individually without modification.
 
 Dev mode is also automatically enabled when using
-`jekyll server` or when a top level configuration key: `dev`
+`jekyll server`, `jekyll --watch` or when a top level configuration key: `dev`
 is set to true.
 
 Default: `false`.

diff --git a/asset_bundler.rb b/asset_bundler.rb
@@ -194,8 +194,8 @@ def self.config(context)
           ret_config['dev'] = context.registers[:site].config["dev"] ? true : false
         end
 
-	    # Let's assume that when flag 'watch' is enabled, we want dev mode
-        if context.registers[:site].config['watch']
+        # Let's assume that when flag 'watch' or 'serving' is enabled, we want dev mode
+        if context.registers[:site].config['serving'] || context.registers[:site].config['watch']
           ret_config['dev'] = true
         end