Skip to content

Commit

Permalink
[release] 0.11.3
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Dec 2, 2014
1 parent d0faa07 commit fe35b51
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"],
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue",
"version": "0.11.2",
"version": "0.11.3",
"main": "src/vue.js",
"author": "Evan You <[email protected]>",
"description": "Simple, Fast & Composable MVVM for building interative interfaces",
Expand Down
28 changes: 20 additions & 8 deletions dist/vue.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Vue.js v0.11.2
* Vue.js v0.11.3
* (c) 2014 Evan You
* Released under the MIT License.
*/
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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}
*/

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions dist/vue.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue",
"version": "0.11.2",
"version": "0.11.3",
"author": "Evan You <[email protected]>",
"license": "MIT",
"description": "Simple, Fast & Composable MVVM for building interative interfaces",
Expand Down

0 comments on commit fe35b51

Please sign in to comment.