simplify v-component usage

vuejs · Dec 23, 2013 · c75aa42 · c75aa42
1 parent cd90e64
commit c75aa42
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/directives/component.js b/src/directives/component.js
@@ -21,15 +21,11 @@ module.exports = {
         if (!Ctor) utils.warn('unknown component: ' + this.arg)
         var options = {
             el: this.el,
+            scope: value,
             compilerOptions: {
                 parentCompiler: this.compiler
             }
         }
-        if (value) {
-            options.scope = {
-                model: value
-            }
-        }
         this.component = new Ctor(options)
     },
 

diff --git a/test/functional/fixtures/extend.html b/test/functional/fixtures/extend.html
@@ -12,7 +12,7 @@
             <div class="filter">{{filterMsg | nodigits}}</div>
             <div class="partial" v-partial="partial-test"></div>
             <div class="vm" v-component="vm-test">{{vmMsg}}</div>
-            <div class="vm-w-model" v-component="vm-w-model:vmData">{{msg + model.msg}}</div>
+            <div class="vm-w-model" v-component="vm-w-model:vmData">{{selfMsg + msg}}</div>
         </div>
         <div id="child">
             <div class="cvm" v-component="vm-test">{{vmMsg}}</div>
@@ -35,7 +35,7 @@
                     },
                     'vm-w-model': {
                         scope : {
-                            msg: 'component with model '
+                            selfMsg: 'component with model '
                         }
                     }
                 },

diff --git a/test/unit/specs/directives.js b/test/unit/specs/directives.js
@@ -602,7 +602,7 @@ describe('UNIT: Directives', function () {
                 },
                 components: {
                     'component-test-2': {
-                        template: '<span>{{model.msg}}</span>'
+                        template: '<span>{{msg}}</span>'
                     }
                 }
             })