Skip to content
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

Jump to bottom

Add slot v-bind warning (fix #6677) #6736

Merged
merged 5 commits into from
Oct 6, 2017
Merged

Add slot v-bind warning (fix #6677) #6736

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5aaf23
fix(slot): add v-bind warning
jamOne- Oct 4, 2017
c00c6a1
refactor(slot): move condition to if statement
jamOne- Oct 4, 2017
21d29a6
test(slot): add warning tests when using v-bind
jamOne- Oct 4, 2017
4834a58
Merge remote-tracking branch 'upstream/dev' into dev
jamOne- Oct 5, 2017
d305a2a
Update render-slot.js
yyx990803 Oct 6, 2017
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
8 changes: 7 additions & 1 deletion src/core/instance/render-helpers/render-slot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* @flow */

import { extend, warn } from 'core/util/index'
import { extend, warn, isObject } from 'core/util/index'

/**
* Runtime helper for rendering <slot>
Expand All @@ -15,6 +15,12 @@ export function renderSlot (
if (scopedSlotFn) { // scoped slot
props = props || {}
if (bindObject) {
if (!isObject(bindObject)) {
process.env.NODE_ENV !== 'production' && warn(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you move the process.env.NODE_ENV !== 'production' into the if condition so it gets stripped off in production mode?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, of course I can move it!
Sure, I will add the test.

'slot v-bind without argument expects an Object',
this
)
}
props = extend(extend({}, bindObject), props)
}
return scopedSlotFn(props) || fallback
Expand Down