* [jsfm] fix append tree

alibaba · May 3, 2016 · d3871b3 · d3871b3
1 parent 0888e2c
commit d3871b3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/src/js-framework/lib/__test__/assets/append-root.output b/src/js-framework/lib/__test__/assets/append-root.output
@@ -3,6 +3,9 @@
   style: {
     flexDirection: 'column'
   },
+  attr: {
+    append: "tree"
+  },
   children: [{
     type: 'container',
     children: [{

diff --git a/src/js-framework/lib/__test__/assets/append.output b/src/js-framework/lib/__test__/assets/append.output
@@ -6,6 +6,9 @@
   children: [{
     type: 'container',
     event: ['click'],
+    attr: {
+      append: 'tree'
+    },
     children: [{
       type: 'container',
       children: [{

diff --git a/src/js-framework/lib/vm/__test__/compiler.js b/src/js-framework/lib/vm/__test__/compiler.js
@@ -308,8 +308,14 @@ describe('generate workflow', () => {
     function check() {
       expect(vm._compile).callCount(3)
       expect(vm._compile.args[0]).eql([target, dest])
-      expect(vm._compile.args[1]).eql([target.children[0], {type: 'a'}])
-      expect(vm._compile.args[2]).eql([target.children[1], {type: 'a'}])
+      expect(vm._compile.args[1]).eql([target.children[0], {
+        attr: {
+          append: 'tree'
+        }, type: 'a'}])
+      expect(vm._compile.args[2]).eql([target.children[1], {
+        attr: {
+          append: 'tree'
+        }, type: 'a'}])
       expect(vm._createBlock).callCount(0)
       expect(vm._mergeContext).callCount(0)
       expect(vm.constructor).callCount(0)

diff --git a/src/js-framework/lib/vm/__test__/vm.js b/src/js-framework/lib/vm/__test__/vm.js
@@ -109,7 +109,9 @@ describe('generate virtual dom for a single vm', () => {
     expect(spy.firstCall.args[2]).to.deep.equal({
       ref: '_root',
       type: 'cell',
-      attr: {},
+      attr: {
+        append: 'tree'
+      },
       style: {},
       children: [{
         ref: '3',

diff --git a/src/js-framework/lib/vm/compiler.js b/src/js-framework/lib/vm/compiler.js
@@ -301,8 +301,8 @@ export function _compileNativeComponent(template, dest, type) {
   }
 
   if (template.append) { // give the append attribute for ios adaptation
-    template.attr = template.attr || {}
-    template.attr.append = template.append
+    element.attr = element.attr || {}
+    element.attr.append = template.append
   }
 
   const treeMode = template.append === 'tree'

diff --git a/src/js-framework/package.json b/src/js-framework/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weex-jsframework",
-  "version": "0.13.8",
+  "version": "0.13.9",
   "description": "JS Framework for Weex solution which is a extendable cross-platform solution for dynamic programming and publishing projects",
   "main": "index.js",
   "scripts": {