Vue.extend: move constructor caching from options to Vue.extend

yyx990803 · yyx990803 · commit 207c8f056a2f · 2015-10-15T15:01:59.000-04:00
diff --git a/src/api/global.js b/src/api/global.js
@@ -39,6 +39,10 @@ var cid = 1
 exports.extend = function (extendOptions) {
   extendOptions = extendOptions || {}
   var Super = this
+  var isFirstExtend = Super.cid === 0
+  if (isFirstExtend && extendOptions._Ctor) {
+    return extendOptions._Ctor
+  }
   var name = extendOptions.name || Super.options.name
   var Sub = createClass(name || 'VueComponent')
   Sub.prototype = Object.create(Super.prototype)
@@ -60,6 +64,10 @@ exports.extend = function (extendOptions) {
   if (name) {
     Sub.options.components[name] = Sub
   }
+  // cache constructor
+  if (isFirstExtend) {
+    extendOptions._Ctor = Sub
+  }
   return Sub
 }
 
diff --git a/src/util/options.js b/src/util/options.js
@@ -232,7 +232,7 @@ function guardComponents (options) {
       def = components[key]
       if (_.isPlainObject(def)) {
         def.name = def.name || key
-        components[key] = def._Ctor || (def._Ctor = _.Vue.extend(def))
+        components[key] = _.Vue.extend(def)
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ function guardComponents (options) {`
`232`	`232`	`def = components[key]`
`233`	`233`	`if (_.isPlainObject(def)) {`
`234`	`234`	`def.name = def.name \|\| key`
`235`		`- components[key] = def._Ctor \|\| (def._Ctor = _.Vue.extend(def))`
	`235`	`+ components[key] = _.Vue.extend(def)`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`	`}`