root
/
vue2
mirror of https://github.com/vuejs/vue.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix use mixin API feat continuous operation (#5610) 

* Update use.js

fix:use feat continuous operation

* Update mixin.js

fix:mixin feat continuous operation
This commit is contained in:
狼族小狈 2017-05-09 20:23:38 +08:00 committed by Evan You
parent ca02043194
commit 1c40e32706
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/global-api/mixin.js
View File

@ -5,5 +5,6 @@ import { mergeOptions } from '../util/index'
export function initMixin (Vue: GlobalAPI) { export function initMixin (Vue: GlobalAPI) {
Vue.mixin = function (mixin: Object) { Vue.mixin = function (mixin: Object) {
this.options = mergeOptions(this.options, mixin) this.options = mergeOptions(this.options, mixin)
return this
} }
} }

2
src/core/global-api/use.js
View File

@ -6,7 +6,7 @@ export function initUse (Vue: GlobalAPI) {
Vue.use = function (plugin: Function | Object) { Vue.use = function (plugin: Function | Object) {
/* istanbul ignore if */ /* istanbul ignore if */
if (plugin.installed) { if (plugin.installed) {
return return this
} }
// additional parameters // additional parameters
const args = toArray(arguments, 1) const args = toArray(arguments, 1)