Skip to content

Commit

Permalink
Merge branch 'master' into typo
Browse files Browse the repository at this point in the history
  • Loading branch information
developit committed Dec 11, 2016
2 parents cda686b + 0eb767c commit b4ade0c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/dom/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ export function removeNode(node) {
* If `value` is `null`, the attribute/handler will be removed.
* @param {Element} node An element to mutate
* @param {string} name The name/key to set, such as an event or attribute name
* @param {any} value An attribute value, such as a function to be used as an event handler
* @param {any} previousValue The last value that was set for this name/node pair
* @param {any} old The last value that was set for this name/node pair
* @param {any} value An attribute value, such as a function to be used as an event handler
* @param {Boolean} isSvg Are we currently diffing inside an svg?
* @private
*/
export function setAccessor(node, name, old, value, isSvg) {
Expand Down
2 changes: 1 addition & 1 deletion src/vdom/diff.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function idiff(dom, vnode, context, mountAll) {
* @param {Element} dom Element whose children should be compared & mutated
* @param {Array} vchildren Array of VNodes to compare to `dom.childNodes`
* @param {Object} context Implicitly descendant context object (from most recent `getChildContext()`)
* @param {Boolean} moutAll
* @param {Boolean} mountAll
*/
function innerDiffNode(dom, vchildren, context, mountAll) {
let originalChildren = dom.childNodes,
Expand Down

0 comments on commit b4ade0c

Please sign in to comment.