separate initRender and initial mounting (fix #4693)

yyx990803 · yyx990803 · commit 7131bc48155f · 2017-01-11T15:01:23.000-05:00
diff --git a/src/core/instance/init.js b/src/core/instance/init.js
@@ -39,10 +39,13 @@ export function initMixin (Vue: Class<Component>) {
     vm._self = vm
     initLifecycle(vm)
     initEvents(vm)
+    initRender(vm)
     callHook(vm, 'beforeCreate')
     initState(vm)
     callHook(vm, 'created')
-    initRender(vm)
+    if (vm.$options.el) {
+      vm.$mount(vm.$options.el)
+    }
   }
 }
 
diff --git a/src/core/instance/render.js b/src/core/instance/render.js
@@ -40,9 +40,6 @@ export function initRender (vm: Component) {
   // normalization is always applied for the public version, used in
   // user-written render functions.
   vm.$createElement = (a, b, c, d) => createElement(vm, a, b, c, d, true)
-  if (vm.$options.el) {
-    vm.$mount(vm.$options.el)
-  }
 }
 
 export function renderMixin (Vue: Class<Component>) {

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,13 @@ export function initMixin (Vue: Class<Component>) {`
`39`	`39`	`vm._self = vm`
`40`	`40`	`initLifecycle(vm)`
`41`	`41`	`initEvents(vm)`
	`42`	`+ initRender(vm)`
`42`	`43`	`callHook(vm, 'beforeCreate')`
`43`	`44`	`initState(vm)`
`44`	`45`	`callHook(vm, 'created')`
`45`		`- initRender(vm)`
	`46`	`+ if (vm.$options.el) {`
	`47`	`+ vm.$mount(vm.$options.el)`
	`48`	`+ }`
`46`	`49`	`}`
`47`	`50`	`}`
`48`	`51`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,6 @@ export function initRender (vm: Component) {`
`40`	`40`	`// normalization is always applied for the public version, used in`
`41`	`41`	`// user-written render functions.`
`42`	`42`	`vm.$createElement = (a, b, c, d) => createElement(vm, a, b, c, d, true)`
`43`		`- if (vm.$options.el) {`
`44`		`- vm.$mount(vm.$options.el)`
`45`		`- }`
`46`	`43`	`}`
`47`	`44`
`48`	`45`	`export function renderMixin (Vue: Class<Component>) {`