Skip to content

refactor: remove duplicate code #9006

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

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

refactor: remove duplicate code #9006

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e032d54
Update patch.js
zwwill Oct 31, 2018
26362d7
Update patch.js
zwwill Dec 14, 2018
e38f9b2
Update patch.js
zwwill Dec 14, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions src/core/vdom/patch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
isDef,
isUndef,
isTrue,
isFalse,
makeMap,
isRegExp,
isPrimitive
Expand Down Expand Up @@ -176,24 +177,15 @@ export function createPatchFunction (backend) {
setScope(vnode)

/* istanbul ignore if */
if (__WEEX__) {
if (__WEEX__ && (isUndef(data) || isFalse(data.appendAsTree))) {
Copy link
Member

Choose a reason for hiding this comment

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

data.appendAsTree will be undefined when append="tree" is not present. Here it's better to just check !data.appendAsTree.
// in Weex, the default insertion order is parent-first.
// List items can be optimized to use children-first insertion
// with append="tree".
const appendAsTree = isDef(data) && isTrue(data.appendAsTree)
if (!appendAsTree) {
if (isDef(data)) {
invokeCreateHooks(vnode, insertedVnodeQueue)
}
insert(parentElm, vnode.elm, refElm)
if (isDef(data)) {
invokeCreateHooks(vnode, insertedVnodeQueue)
}
insert(parentElm, vnode.elm, refElm)
createChildren(vnode, children, insertedVnodeQueue)
if (appendAsTree) {
if (isDef(data)) {
invokeCreateHooks(vnode, insertedVnodeQueue)
}
insert(parentElm, vnode.elm, refElm)
}
} else {
createChildren(vnode, children, insertedVnodeQueue)
if (isDef(data)) {
Expand All @@ -205,11 +197,10 @@ export function createPatchFunction (backend) {
if (process.env.NODE_ENV !== 'production' && data && data.pre) {
creatingElmInVPre--
}
} else if (isTrue(vnode.isComment)) {
vnode.elm = nodeOps.createComment(vnode.text)
insert(parentElm, vnode.elm, refElm)
} else {
vnode.elm = nodeOps.createTextNode(vnode.text)
vnode.elm = isTrue(vnode.isComment)
? nodeOps.createComment(vnode.text)
: nodeOps.createTextNode(vnode.text)
insert(parentElm, vnode.elm, refElm)
}
}
Expand Down