Skip to content

Commit 58d0228

Browse files
committed
[release] 1.0.0-rc.1
1 parent 7caf4d6 commit 58d0228

File tree

4 files changed

+29
-30
lines changed

4 files changed

+29
-30
lines changed

dist/vue.js

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v1.0.0-beta.4
2+
* Vue.js v1.0.0-rc.1
33
* (c) 2015 Evan You
44
* Released under the MIT License.
55
*/
@@ -146,7 +146,7 @@ return /******/ (function(modules) { // webpackBootstrap
146146
extend(p, __webpack_require__(65))
147147
extend(p, __webpack_require__(66))
148148

149-
Vue.version = '1.0.0-beta.3'
149+
Vue.version = '1.0.0-rc.1'
150150
module.exports = _.Vue = Vue
151151

152152

@@ -1615,6 +1615,7 @@ return /******/ (function(modules) { // webpackBootstrap
16151615
* Hooks and param attributes are merged as arrays.
16161616
*/
16171617

1618+
strats.init =
16181619
strats.created =
16191620
strats.ready =
16201621
strats.attached =
@@ -1737,8 +1738,8 @@ return /******/ (function(modules) { // webpackBootstrap
17371738
}
17381739
def = components[key]
17391740
if (_.isPlainObject(def)) {
1740-
def.id = def.id || key
1741-
components[key] = def._Ctor || (def._Ctor = _.Vue.extend(def))
1741+
def.name = def.name || key
1742+
components[key] = _.Vue.extend(def)
17421743
}
17431744
}
17441745
}
@@ -1786,10 +1787,10 @@ return /******/ (function(modules) { // webpackBootstrap
17861787
var asset
17871788
while (i--) {
17881789
asset = assets[i]
1789-
var id = asset.id || (asset.options && asset.options.id)
1790+
var id = asset.name || (asset.options && asset.options.name)
17901791
if (!id) {
17911792
("development") !== 'production' && _.warn(
1792-
'Array-syntax assets must provide an id field.'
1793+
'Array-syntax assets must provide a "name" field.'
17931794
)
17941795
} else {
17951796
res[id] = asset
@@ -2113,6 +2114,10 @@ return /******/ (function(modules) { // webpackBootstrap
21132114
exports.extend = function (extendOptions) {
21142115
extendOptions = extendOptions || {}
21152116
var Super = this
2117+
var isFirstExtend = Super.cid === 0
2118+
if (isFirstExtend && extendOptions._Ctor) {
2119+
return extendOptions._Ctor
2120+
}
21162121
var name = extendOptions.name || Super.options.name
21172122
var Sub = createClass(name || 'VueComponent')
21182123
Sub.prototype = Object.create(Super.prototype)
@@ -2134,6 +2139,10 @@ return /******/ (function(modules) { // webpackBootstrap
21342139
if (name) {
21352140
Sub.options.components[name] = Sub
21362141
}
2142+
// cache constructor
2143+
if (isFirstExtend) {
2144+
extendOptions._Ctor = Sub
2145+
}
21372146
return Sub
21382147
}
21392148

@@ -4975,11 +4984,8 @@ return /******/ (function(modules) { // webpackBootstrap
49754984
'false-value': '_falseValue'
49764985
}
49774986

4978-
// regex to test for globally allowed attributes.
4979-
// we only need to include ones that:
4980-
// - do not have a corresponding property, e.g. role, dropzone;
4981-
// - cannot be camelized into the corresponding property, .e.g class, accesskey, contenteditable;
4982-
var globalAllowedAttrRE = /^(class|role|accesskey|contenteditable|contextmenu|dropzone|hidden|tabindex)$|^data-|^aria-/
4987+
// check for attribtues that prohibit interpolations
4988+
var disallowedInterpAttrRE = /^v-|^:|^@|^(is|transition|transition-mode|debounce|track-by|stagger|enter-stagger|leave-stagger)$/
49834989

49844990
module.exports = {
49854991

@@ -4990,21 +4996,11 @@ return /******/ (function(modules) { // webpackBootstrap
49904996
// handle interpolation bindings
49914997
if (this.descriptor.interp) {
49924998
// only allow binding on native attributes
4993-
if (!(
4994-
// globally allowed attributes
4995-
globalAllowedAttrRE.test(attr) ||
4996-
// check if "for" is available on current element.
4997-
// the corresponding property is a special case.
4998-
(attr === 'for' && 'htmlFor' in this.el) ||
4999-
// other attributes: check if a camelized property
5000-
// is available on the element
5001-
_.camelize(attr) in this.el
5002-
)) {
4999+
if (disallowedInterpAttrRE.test(attr)) {
50035000
("development") !== 'production' && _.warn(
50045001
attr + '="' + this.descriptor.raw + '": ' +
5005-
'attribute interpolation is allowed only ' +
5006-
'in valid native attributes. "' + attr + '" ' +
5007-
'is not a valid attribute on <' + this.el.tagName.toLowerCase() + '>.'
5002+
'attribute interpolation is not allowed in Vue.js ' +
5003+
'directives and special attributes.'
50085004
)
50095005
this.el.removeAttribute(attr)
50105006
this.invalid = true
@@ -7543,7 +7539,7 @@ return /******/ (function(modules) { // webpackBootstrap
75437539

75447540
var _ = __webpack_require__(1)
75457541
var templateParser = __webpack_require__(18)
7546-
var specialCharRE = /[^a-zA-Z_\-:\.]/
7542+
var specialCharRE = /[^\w\-:\.]/
75477543

75487544
/**
75497545
* Process an element or a DocumentFragment based on a
@@ -8223,6 +8219,9 @@ return /******/ (function(modules) { // webpackBootstrap
82238219
// it will be filled up in _initScope().
82248220
this._data = {}
82258221

8222+
// call init hook
8223+
this._callHook('init')
8224+
82268225
// initialize data observation and scope inheritance.
82278226
this._initState()
82288227

dist/vue.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue",
3-
"version": "1.0.0-beta.4",
3+
"version": "1.0.0-rc.1",
44
"author": "Evan You <yyx990803@gmail.com>",
55
"license": "MIT",
66
"description": "Simple, Fast & Composable MVVM for building interative interfaces",

src/vue.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,5 @@ extend(p, require('./api/dom'))
8585
extend(p, require('./api/events'))
8686
extend(p, require('./api/lifecycle'))
8787

88-
Vue.version = '1.0.0-beta.4'
88+
Vue.version = '1.0.0-rc.1'
8989
module.exports = _.Vue = Vue

0 commit comments

Comments
 (0)