vue-server
Advanced tools
Comparing version 0.4.16 to 0.4.17
{ | ||
"name": "vue-server", | ||
"version": "0.4.16", | ||
"version": "0.4.17", | ||
"description": "Vue.js server side version", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -224,3 +224,3 @@ var utils = require('./../utils.js'); | ||
var presentVm; | ||
var $target = self.getRealParent(vm); | ||
var $target = self.getFirstPublicParent(vm); | ||
@@ -466,5 +466,8 @@ if (this.__states.VMsDetached && options.component && !options.repeatData) { | ||
isSystemProp: function (name, $parent) { | ||
if ($parent && $parent.$options.methods && $parent.$options.methods[name]) { | ||
return false; | ||
isSystemProp: function (name, vm) { | ||
if (vm) { | ||
var realParent = this.getFirstPublicParent(vm); | ||
if (realParent.$options.methods && realParent.$options.methods[name]) { | ||
return false; | ||
} | ||
} | ||
@@ -803,5 +806,5 @@ | ||
getRealParent: function (vm) { | ||
getFirstPublicParent: function (vm) { | ||
if (vm.__states.notPublic) { | ||
return this.getRealParent(vm.__states.parent); | ||
return this.getFirstPublicParent(vm.__states.parent); | ||
} | ||
@@ -808,0 +811,0 @@ |
@@ -200,2 +200,24 @@ var wrapComponent = require('./../wrapComponent.js'); | ||
} | ||
}, | ||
deepIterate: { | ||
template: [ | ||
'<div>', | ||
'<div v-for="item in [1]">', | ||
'<div v-for="am in [1]">', | ||
'<i v-for="it in [am]">{{getSome()}}</i>', | ||
'</div>', | ||
'</div>', | ||
'</div>', | ||
].join(''), | ||
methods: { | ||
getSome: function () { | ||
return this._getSome(); | ||
}, | ||
_getSome: function () { | ||
return 123; | ||
}, | ||
} | ||
} | ||
@@ -398,2 +420,6 @@ }, | ||
}); | ||
it('inside deep itertations private methods from parent component should be available', function () { | ||
expect($('#deep-iterate i').text()).toEqual('123'); | ||
}); | ||
}); | ||
@@ -400,0 +426,0 @@ |
Sorry, the diff of this file is not supported yet
314629
7728