Skip to content

Commit

Permalink
Merge pull request #3216 from monoblaine/options-and-defaults
Browse files Browse the repository at this point in the history
Fix enhance & append conflict check
  • Loading branch information
evs-chris committed Mar 19, 2018
2 parents ff430f5 + effefe3 commit 40704fe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/Ractive/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function configure(method, Parent, target, options, Child) {
}

// disallow combination of `append` and `enhance`
if (options.append && options.enhance) {
if (target.append && target.enhance) {
throw new Error('Cannot use append and enhance at the same time');
}

Expand Down
1 change: 1 addition & 0 deletions src/Ractive/config/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default {
el: void 0,
append: false,
delegate: true,
enhance: false,

// template:
template: null,
Expand Down

0 comments on commit 40704fe

Please sign in to comment.