Merge pull request #2346 from mtpc/dev

yyx990803 · yyx990803 · commit 4d090230595e · 2016-02-15T15:06:33.000-05:00
Pass a context to factory functions
diff --git a/src/instance/internal/misc.js b/src/instance/internal/misc.js
@@ -76,7 +76,7 @@ export default function (Vue) {
       } else {
         factory.requested = true
         var cbs = factory.pendingCallbacks = [cb]
-        factory(function resolve (res) {
+        factory.call(this, function resolve (res) {
           if (isPlainObject(res)) {
             res = Vue.extend(res)
           }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ export default function (Vue) {`
`76`	`76`	`} else {`
`77`	`77`	`factory.requested = true`
`78`	`78`	`var cbs = factory.pendingCallbacks = [cb]`
`79`		`- factory(function resolve (res) {`
	`79`	`+ factory.call(this, function resolve (res) {`
`80`	`80`	`if (isPlainObject(res)) {`
`81`	`81`	`res = Vue.extend(res)`
`82`	`82`	`}`