relax v-component limitation

vuejs · Jun 25, 2015 · fc9b33b · fc9b33b
1 parent 428bc4f
commit fc9b33b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/src/compiler/compile.js b/src/compiler/compile.js
@@ -245,7 +245,7 @@ function compileElement (el, options) {
   }
   // check component
   if (!linkFn) {
-    linkFn = checkComponent(el, options)
+    linkFn = checkComponent(el, options, hasAttrs)
   }
   // normal directives
   if (!linkFn && hasAttrs) {
@@ -573,11 +573,12 @@ function checkElementDirectives (el, options) {
  *
  * @param {Element} el
  * @param {Object} options
+ * @param {Boolean} hasAttrs
  * @return {Function|undefined}
  */
 
-function checkComponent (el, options) {
-  var componentId = _.checkComponent(el, options)
+function checkComponent (el, options, hasAttrs) {
+  var componentId = _.checkComponent(el, options, hasAttrs)
   if (componentId) {
     var componentLinkFn = function (vm, el, host) {
       vm._bindDir('component', el, {

diff --git a/src/util/debug.js b/src/util/debug.js
@@ -48,13 +48,6 @@ function enableDebug () {
   exports.assertAsset = function (val, type, id) {
     /* istanbul ignore if */
     if (type === 'directive') {
-      if (id === 'component') {
-        exports.warn(
-          'v-component can only be used on table elements ' +
-          'in ^0.12.0. Use custom element syntax instead.'
-        )
-        return
-      }
       if (id === 'with') {
         exports.warn(
           'v-with has been deprecated in ^0.12.0. ' +
@@ -74,4 +67,4 @@ function enableDebug () {
       exports.warn('Failed to resolve ' + type + ': ' + id)
     }
   }
-}
+}
diff --git a/src/util/misc.js b/src/util/misc.js
@@ -77,13 +77,12 @@ function formatValue (val) {
  *
  * @param {Element} el
  * @param {Object} options
+ * @param {Boolean} hasAttrs
  * @return {String|undefined}
  */
 
 exports.commonTagRE = /^(div|p|span|img|a|br|ul|ol|li|h1|h2|h3|h4|h5|code|pre)$/
-exports.tableElementsRE = /^caption|colgroup|thead|tfoot|tbody|tr|td|th$/
-
-exports.checkComponent = function (el, options) {
+exports.checkComponent = function (el, options, hasAttrs) {
   var tag = el.tagName.toLowerCase()
   if (tag === 'component') {
     // dynamic syntax
@@ -96,7 +95,7 @@ exports.checkComponent = function (el, options) {
   ) {
     return tag
   } else if (
-    exports.tableElementsRE.test(tag) &&
+    hasAttrs &&
     (tag = _.attr(el, 'component'))
   ) {
     return tag