2.0.5

Author: yyx990803

themes/vue/_config.yml

@@ -1,4 +1,4 @@
 site_description: "Vue.js - Intuitive, Fast and Composable MVVM for building interactive interfaces."
 google_analytics: UA-46852172-1
 root_domain: cn.vuejs.org
-vue_version: 2.0.4
+vue_version: 2.0.5

themes/vue/source/js/vue.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.0.4
+ * Vue.js v2.0.5
  * (c) 2014-2016 Evan You
  * Released under the MIT License.
  */
@@ -1769,6 +1769,7 @@ function lifecycleMixin (Vue) {
       {
         observerState.isSettingProps = false;
       }
+      vm.$options.propsData = propsData;
     }
     // update listeners
     if (listeners) {
@@ -2192,8 +2193,9 @@ function _createElement (
       // unknown or unlisted namespaced elements
       // check at runtime because it may get assigned a namespace when its
       // parent normalizes children
+      var childNs = tag === 'foreignObject' ? 'xhtml' : ns;
       return new VNode(
-        tag, data, normalizeChildren(children, ns),
+        tag, data, normalizeChildren(children, childNs),
         undefined, undefined, ns, context
       )
     }
@@ -2259,7 +2261,7 @@ function renderMixin (Vue) {
         if (config._isServer) {
           throw e
         } else {
-          setTimeout(function () { throw e }, 0);
+          console.error(e);
         }
       }
       // return previous vnode to prevent render error causing blank component
@@ -2847,25 +2849,16 @@ var defaultStrat = function (parentVal, childVal) {
 };
 
 /**
- * Make sure component options get converted to actual
- * constructors.
+ * Validate component names
  */
-function normalizeComponents (options) {
-  if (options.components) {
-    var components = options.components;
-    var normalized = options.components = {};
-    var def;
-    for (var key in components) {
-      var lower = key.toLowerCase();
-      if (isBuiltInTag(lower) || config.isReservedTag(lower)) {
-        "development" !== 'production' && warn(
-          'Do not use built-in or reserved HTML elements as component ' +
-          'id: ' + key
-        );
-        continue
-      }
-      def = components[key];
-      normalized[key] = isPlainObject(def) ? Vue$2.extend(def) : def;
+function checkComponents (options) {
+  for (var key in options.components) {
+    var lower = key.toLowerCase();
+    if (isBuiltInTag(lower) || config.isReservedTag(lower)) {
+      warn(
+        'Do not use built-in or reserved HTML elements as component ' +
+        'id: ' + key
+      );
     }
   }
 }
@@ -2926,7 +2919,9 @@ function mergeOptions (
   child,
   vm
 ) {
-  normalizeComponents(child);
+  {
+    checkComponents(child);
+  }
   normalizeProps(child);
   normalizeDirectives(child);
   var extendsFrom = child.extends;
@@ -3029,7 +3024,7 @@ function validateProp (
 /**
  * Get the default value of a prop.
  */
-function getPropDefaultValue (vm, prop, name) {
+function getPropDefaultValue (vm, prop, key) {
   // no default, return undefined
   if (!hasOwn(prop, 'default')) {
     return undefined
@@ -3038,12 +3033,19 @@ function getPropDefaultValue (vm, prop, name) {
   // warn against non-factory defaults for Object & Array
   if (isObject(def)) {
     "development" !== 'production' && warn(
-      'Invalid default value for prop "' + name + '": ' +
+      'Invalid default value for prop "' + key + '": ' +
       'Props with type Object/Array must use a factory function ' +
       'to return the default value.',
       vm
     );
   }
+  // the raw prop value was also undefined from previous render,
+  // return previous default value to avoid unnecessary watcher trigger
+  if (vm && vm.$options.propsData &&
+    vm.$options.propsData[key] === undefined &&
+    vm[key] !== undefined) {
+    return vm[key]
+  }
   // call factory function for non-Function types
   return typeof def === 'function' && prop.type !== Function
     ? def.call(vm)
@@ -3408,7 +3410,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
   get: function () { return config._isServer; }
 });
 
-Vue$2.version = '2.0.4';
+Vue$2.version = '2.0.5';
 
 /*  */
 
@@ -3534,7 +3536,8 @@ function stringifyClass (value) {
 
 var namespaceMap = {
   svg: 'http://www.w3.org/2000/svg',
-  math: 'http://www.w3.org/1998/Math/MathML'
+  math: 'http://www.w3.org/1998/Math/MathML',
+  xhtml: 'http://www.w3.org/1999/xhtm'
 };
 
 var isHTMLTag = makeMap(
@@ -5724,6 +5727,8 @@ var startTagOpen = new RegExp('^<' + qnameCapture);
 var startTagClose = /^\s*(\/?)>/;
 var endTag = new RegExp('^<\\/' + qnameCapture + '[^>]*>');
 var doctype = /^<!DOCTYPE [^>]+>/i;
+var comment = /^<!--/;
+var conditionalComment = /^<!\[/;
 
 var IS_REGEX_CAPTURING_BROKEN = false;
 'x'.replace(/x(.)?/g, function (m, g) {
@@ -5781,7 +5786,7 @@ function parseHTML (html, options) {
       var textEnd = html.indexOf('<');
       if (textEnd === 0) {
         // Comment:
-        if (/^<!--/.test(html)) {
+        if (comment.test(html)) {
           var commentEnd = html.indexOf('-->');
 
           if (commentEnd >= 0) {
@@ -5791,7 +5796,7 @@ function parseHTML (html, options) {
         }
 
         // http://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment
-        if (/^<!\[/.test(html)) {
+        if (conditionalComment.test(html)) {
           var conditionalEnd = html.indexOf(']>');
 
           if (conditionalEnd >= 0) {
@@ -5824,12 +5829,19 @@ function parseHTML (html, options) {
         }
       }
 
-      var text = void 0, rest$1 = void 0;
+      var text = void 0, rest$1 = void 0, next = void 0;
       if (textEnd > 0) {
         rest$1 = html.slice(textEnd);
-        while (!startTagOpen.test(rest$1) && !endTag.test(rest$1)) {
+        while (
+          !endTag.test(rest$1) &&
+          !startTagOpen.test(rest$1) &&
+          !comment.test(rest$1) &&
+          !conditionalComment.test(rest$1)
+        ) {
           // < in plain text, be forgiving and treat it as text
-          textEnd += rest$1.indexOf('<', 1);
+          next = rest$1.indexOf('<', 1);
+          if (next < 0) { break }
+          textEnd += next;
           rest$1 = html.slice(textEnd);
         }
         text = html.substring(0, textEnd);
@@ -5865,8 +5877,9 @@ function parseHTML (html, options) {
       parseEndTag('</' + stackedTag + '>', stackedTag, index - endTagLength, index);
     }
 
-    if (html === last) {
-      throw new Error('Error parsing template:\n\n' + html)
+    if (html === last && options.chars) {
+      options.chars(html);
+      break
     }
   }
 

themes/vue/source/js/vue.min.js

@@ -1,7 +1,7 @@
 var fs = require('fs')
 var version = require('../vue/package.json').version
 var themeconfPath = 'themes/vue/_config.yml'
-var installPath = 'src/v2/guide/installation.md'
+var installPath = 'src/guide/installation.md'
 var themeconfig = fs.readFileSync(themeconfPath, 'utf-8')
 var installation = fs.readFileSync(installPath, 'utf-8')