Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 7 additions & 10 deletions render/hyperscript.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,21 @@ function execSelector(state, vnode) {
return vnode
}

var hasClass = hasOwn.call(attrs, "class")
var className = hasClass ? attrs.class : attrs.className
if (hasOwn.call(attrs, "class")) {
if (attrs.class != null) attrs.className = attrs.class
attrs.class = null
}

if (state.attrs !== emptyAttrs) {
var className = attrs.className
attrs = Object.assign({}, state.attrs, attrs)

if (className != null || state.attrs.className != null) attrs.className =
if (state.attrs.className != null) attrs.className =
className != null
? state.attrs.className != null
? String(state.attrs.className) + " " + String(className)
: className
? String(state.attrs.className) + " " + String(className)
: state.attrs.className
} else {
if (className != null) attrs.className = className
}

if (hasClass) attrs.class = null

// workaround for #2622 (reorder keys in attrs to set "type" first)
// The DOM does things to inputs based on the "type", so it needs set first.
// See: https://github.com/MithrilJS/mithril.js/issues/2622
Expand Down