Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:bevry/docpad into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
balupton committed Jul 4, 2012
2 parents 342fd38 + 9c4cfe5 commit 135c160
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
3 changes: 1 addition & 2 deletions src/lib/docpad.coffee
Expand Up @@ -94,13 +94,12 @@ class DocPad extends EventEmitterEnhanced

# Event Listing
# Whenever a event is created, it must be applied here to be available to plugins and configuration files
# https://github.com/bevry/docpad/wiki/Events
events: [
'docpadReady'
'consoleSetup'
'generateBefore'
'generateAfter'
'cleanBefore'
'cleanAfter'
'parseBefore'
'parseAfter'
'renderBefore'
Expand Down
4 changes: 0 additions & 4 deletions src/lib/plugin.coffee
Expand Up @@ -11,9 +11,6 @@ class BasePlugin
# DocPad Instance
docpad: null

# Logger Instance
logger: null # deprecated, use @docpad.getLogger() instead


# ---------------------------------
# Variables
Expand All @@ -34,7 +31,6 @@ class BasePlugin
@events = _.extend([],@events)
@config = _.extend({},@config,config)
@docpad = @config.docpad
@logger = @docpad.logger # deprecated
@name or= @config.name if @config.name
if !@name
throw new Error 'Plugin must have a name'
Expand Down

0 comments on commit 135c160

Please sign in to comment.