Skip to content

Commit

Permalink
v6.26.2. Bugfix. Improvement.
Browse files Browse the repository at this point in the history
- v6.26.2 March 23, 2013
	- Fixes `TypeError: Object #<Object> has no method 'removeListener'`
		- Thanks to [Steven Lindberg](https://github.com/slindberg) for
[issue #462](#462)
	- Can now customise the `watchOptions` that are used to construct the
[watchr](https://github.com/bevry/watchr) instances we create
	- Updated dependencies
  • Loading branch information
balupton committed Mar 23, 2013
1 parent 7cfbfda commit 2ffb091
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ install: "npm install"
before_script: "./node_modules/.bin/cake test-prepare"
script: "./node_modules/.bin/cake test"
node_js:
- 0.6
- 0.8
- 0.9
- "0.6"
- "0.8"
- "0.10"
notifications:
irc:
- "irc.freenode.org#bevry-dev"
- "irc.freenode.org#docpad-dev"
email:
recipients:
- travis@docpad.org
- travisci@bevry.me
6 changes: 6 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## History

- v6.26.2 March 23, 2013
- Fixes `TypeError: Object #<Object> has no method 'removeListener'`
- Thanks to [Steven Lindberg](https://github.com/slindberg) for [issue #462](https://github.com/bevry/docpad/issues/462)
- Can now customise the `watchOptions` that are used to construct the [watchr](https://github.com/bevry/watchr) instances we create
- Updated dependencies

- v6.26.1 March 12, 2013
- We now gather statistics on the node version and platform you are using to better understand where issues are coming from
- Updated dev dependencies
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docpad",
"version": "6.26.1",
"version": "6.26.2",
"description": "DocPad is a language agnostic document management system. This means you write your website as documents, in whatever language you wish, and DocPad will handle the compiling, templates and layouts for you. For static documents it will generate static files, for dynamic documents it'll re-render them on each request. You can utilise DocPad by itself, or use it as a module your own custom system. It's pretty cool, and well worth checking out. We love it.",
"homepage": "https://github.com/bevry/docpad",
"installUrl": "http://docpad.org/install",
Expand Down Expand Up @@ -62,32 +62,32 @@
"npm": ">=1.1"
},
"dependencies": {
"bal-util": "~1.16.10",
"bal-util": "~1.16.13",
"caterpillar": "~1.1.3",
"commander": "~1.1.1",
"cson": "~1.4.0",
"cson": "~1.4.1",
"express": "~3.1.0",
"jschardet": "~1.0.2",
"mime": "~1.2.7",
"query-engine": "~1.5.0",
"semver": "~1.1.2",
"lodash": "~1.0.0",
"backbone": "0.9.10",
"watchr": "~2.3.7",
"mime": "~1.2.9",
"query-engine": "~1.5.2",
"semver": "~1.1.4",
"lodash": "~1.0.1",
"backbone": "1.0.0",
"watchr": "~2.3.9",
"yamljs": "~0.1.4",
"getmac": "~1.0.4"
},
"optionalDependencies": {
"airbrake": "~0.2.9",
"iconv": "~2.0.3",
"iconv": "~2.0.4",
"growl": "~1.7.0",
"mixpanel": "0.0.10"
},
"devDependencies": {
"coffee-script": "~1.6.1",
"coffee-script": "~1.6.2",
"chai": "~1.5.0",
"joe": "~1.1.1",
"request": "~2.16.2"
"request": "~2.16.6"
},
"directories": {
"lib": "./out/lib"
Expand Down
5 changes: 4 additions & 1 deletion src/lib/docpad.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,9 @@ class DocPad extends EventEmitterEnhanced
ignoreCommonPatterns: true
ignoreCustomPatterns: false

# Watch options
watchOptions: null


# -----------------------------
# Server
Expand Down Expand Up @@ -1010,7 +1013,7 @@ class DocPad extends EventEmitterEnhanced
ignoreHiddenFiles: @config.ignoreHiddenFiles
ignoreCommonPatterns: @config.ignoreCommonPatterns
ignoreCustomPatterns: @config.ignoreCustomPatterns
},opts)
},opts,@config.watchOptions)
return require('watchr').watch(opts)


Expand Down

0 comments on commit 2ffb091

Please sign in to comment.