mixin -> extend

src/instance/init.js

@@ -1,4 +1,4 @@
-var _ = require('../util')
+var mergeOptions = require('../util').mergeOptions
 
 /**
  * The main init sequence. This is called for every instance,
@@ -21,7 +21,7 @@ exports._init = function (options) {
   this._rawContent  = null
 
   // merge options.
-  this.$options = _.mergeOptions(
+  this.$options = mergeOptions(
     this.constructor.options,
     options,
     this

src/util/index.js

@@ -3,11 +3,11 @@ var config = require('../config')
 var env = require('./env')
 var lang = require('./lang')
 var dom = require('./dom')
-var mixin = lang.mixin
+var extend = lang.extend
 
-mixin(_, env)
-mixin(_, lang)
-mixin(_, dom)
+extend(_, env)
+extend(_, lang)
+extend(_, dom)
 
 /**
  * Option overwriting strategies are functions that handle
@@ -53,8 +53,8 @@ strats.components = function (parentVal, childVal, key, vm) {
   var ret = Object.create(vm.$parent
     ? vm.$parent.$options[key]
     : null)
-  mixin(ret, parentVal) 
-  mixin(ret, childVal)
+  extend(ret, parentVal) 
+  extend(ret, childVal)
   return ret
 }
 
@@ -65,7 +65,7 @@ strats.components = function (parentVal, childVal, key, vm) {
 strats.methods =
 strats.computed = function (parentVal, childVal) {
   var ret = Object.create(parentVal || null)
-  mixin(ret, childVal)
+  extend(ret, childVal)
   return ret
 }
 

src/util/lang.js

@@ -18,7 +18,7 @@ exports.toArray = function (list, i) {
  * @param {Object} from
  */
 
-exports.mixin = function (to, from) {
+exports.extend = function (to, from) {
   for (var key in from) {
     to[key] = from[key]
   }

src/vue.js

@@ -1,4 +1,4 @@
-var _ = require('./util')
+var extend = require('./util').extend
 
 /**
  * The exposed Vue constructor.
@@ -54,26 +54,26 @@ Object.defineProperty(p, '$data', {
  * Mixin internal instance methods
  */
 
-_.mixin(p, require('./instance/init'))
-_.mixin(p, require('./instance/scope'))
-_.mixin(p, require('./instance/data'))
-_.mixin(p, require('./instance/proxy'))
-_.mixin(p, require('./instance/bindings'))
-_.mixin(p, require('./instance/compile'))
+extend(p, require('./instance/init'))
+extend(p, require('./instance/scope'))
+extend(p, require('./instance/data'))
+extend(p, require('./instance/proxy'))
+extend(p, require('./instance/bindings'))
+extend(p, require('./instance/compile'))
 
 /**
  * Mixin public API methods
  */
 
-_.mixin(p, require('./api/data'))
-_.mixin(p, require('./api/dom'))
-_.mixin(p, require('./api/events'))
-_.mixin(p, require('./api/lifecycle'))
+extend(p, require('./api/data'))
+extend(p, require('./api/dom'))
+extend(p, require('./api/events'))
+extend(p, require('./api/lifecycle'))
 
 /**
  * Mixin global API
  */
 
-_.mixin(Vue, require('./api/global'))
+extend(Vue, require('./api/global'))
 
 module.exports = Vue