Skip to content

Update themr #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 6, 2018
Merged

Update themr #16

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b6db63
Update themr.js
idangozlan Jun 7, 2017
7756ddc
Modify error to be more informative
idangozlan Jun 8, 2017
6462756
Merge branch 'master' into update_themr
markusguenther Aug 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/components/themr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,7 @@ function merge(original = {}, mixin = {}) {
switch (typeof originalValue) {
case 'object': {
//can't merge a non-object with an object
throw new Error(`You are merging non-object ${mixinValue} with an object ${key}`)
break
throw new Error(`You are merging non-object ${mixinValue} with an object ${key}, (can occur when using empty or :global only base theme stylesheet)`)
}

case 'undefined': {
Expand Down