mirror of https://github.com/vuejs/vue.git
[release] 0.11.3
This commit is contained in:
parent
d0faa07d42
commit
fe35b5101f
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "vue",
|
||||
"version": "0.11.2",
|
||||
"version": "0.11.3",
|
||||
"main": "dist/vue.js",
|
||||
"description": "Simple, Fast & Composable MVVM for building interative interfaces",
|
||||
"authors": ["Evan You <yyx990803@gmail.com>"],
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "vue",
|
||||
"version": "0.11.2",
|
||||
"version": "0.11.3",
|
||||
"main": "src/vue.js",
|
||||
"author": "Evan You <yyx990803@gmail.com>",
|
||||
"description": "Simple, Fast & Composable MVVM for building interative interfaces",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Vue.js v0.11.2
|
||||
* Vue.js v0.11.3
|
||||
* (c) 2014 Evan You
|
||||
* Released under the MIT License.
|
||||
*/
|
||||
|
@ -1628,6 +1628,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
|||
|
||||
exports._compile = function (el) {
|
||||
var options = this.$options
|
||||
var parent = options._parent
|
||||
if (options._linkFn) {
|
||||
this._initElement(el)
|
||||
options._linkFn(this, el)
|
||||
|
@ -1637,20 +1638,26 @@ return /******/ (function(modules) { // webpackBootstrap
|
|||
// separate container element and content
|
||||
var content = options._content = _.extractContent(raw)
|
||||
// create two separate linekrs for container and content
|
||||
var parentOptions = parent.$options
|
||||
|
||||
// hack: we need to skip the paramAttributes for this
|
||||
// child instance when compiling its parent container
|
||||
// linker. there could be a better way to do this.
|
||||
parentOptions._skipAttrs = options.paramAttributes
|
||||
var containerLinkFn =
|
||||
compile(raw, options, true, true)
|
||||
compile(raw, parentOptions, true, true)
|
||||
parentOptions._skipAttrs = null
|
||||
|
||||
if (content) {
|
||||
var contentLinkFn =
|
||||
compile(content, options, true, true)
|
||||
compile(content, parentOptions, true)
|
||||
// call content linker now, before transclusion
|
||||
this._contentUnlinkFn =
|
||||
contentLinkFn(options._parent, content)
|
||||
this._contentUnlinkFn = contentLinkFn(parent, content)
|
||||
}
|
||||
// tranclude, this possibly replaces original
|
||||
el = transclude(el, options)
|
||||
// now call the container linker on the resolved el
|
||||
this._containerUnlinkFn =
|
||||
containerLinkFn(options._parent, el)
|
||||
this._containerUnlinkFn = containerLinkFn(parent, el)
|
||||
} else {
|
||||
// simply transclude
|
||||
el = transclude(el, options)
|
||||
|
@ -4612,7 +4619,8 @@ return /******/ (function(modules) { // webpackBootstrap
|
|||
* @param {Element|DocumentFragment} el
|
||||
* @param {Object} options
|
||||
* @param {Boolean} partial
|
||||
* @param {Boolean} asParent
|
||||
* @param {Boolean} asParent - compiling a component
|
||||
* container as its parent.
|
||||
* @return {Function}
|
||||
*/
|
||||
|
||||
|
@ -5102,6 +5110,10 @@ return /******/ (function(modules) { // webpackBootstrap
|
|||
*/
|
||||
|
||||
function collectAttrDirective (el, name, value, options) {
|
||||
if (options._skipAttrs &&
|
||||
options._skipAttrs.indexOf(name) > -1) {
|
||||
return
|
||||
}
|
||||
var tokens = textParser.parse(value)
|
||||
if (tokens) {
|
||||
var def = options.directives.attr
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "vue",
|
||||
"version": "0.11.2",
|
||||
"version": "0.11.3",
|
||||
"author": "Evan You <yyx990803@gmail.com>",
|
||||
"license": "MIT",
|
||||
"description": "Simple, Fast & Composable MVVM for building interative interfaces",
|
||||
|
|
Loading…
Reference in New Issue