merge dev branch

Lucifier129 · Lucifier129 · commit b778674494fe · 2016-05-19T21:57:53.000+08:00
diff --git a/dist/react-lite.common.js b/dist/react-lite.common.js
@@ -1,5 +1,5 @@
 /*!
- * react-lite.js v0.15.12
+ * react-lite.js v0.15.13
  * (c) 2016 Jade Gu
  * Released under the MIT License.
  */
@@ -1864,7 +1864,7 @@ function render(vnode, container, callback) {
 }
 
 function unstable_renderSubtreeIntoContainer(parentComponent, subVnode, container, callback) {
-	var context = parentComponent.vnode ? parentComponent.vnode.context : parentComponent.$cache.parentContext;
+	var context = parentComponent.$cache.parentContext;
 	return renderTreeIntoContainer(subVnode, container, callback, context);
 }
 
diff --git a/dist/react-lite.js b/dist/react-lite.js
@@ -1,5 +1,5 @@
 /*!
- * react-lite.js v0.15.12
+ * react-lite.js v0.15.13
  * (c) 2016 Jade Gu
  * Released under the MIT License.
  */
@@ -1868,7 +1868,7 @@
   }
 
   function unstable_renderSubtreeIntoContainer(parentComponent, subVnode, container, callback) {
-  	var context = parentComponent.vnode ? parentComponent.vnode.context : parentComponent.$cache.parentContext;
+  	var context = parentComponent.$cache.parentContext;
   	return renderTreeIntoContainer(subVnode, container, callback, context);
   }
 
diff --git a/dist/react-lite.min.js b/dist/react-lite.min.js
diff --git a/dist/react-lite.min.js.gz b/dist/react-lite.min.js.gz
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-lite",
-  "version": "0.15.12",
+  "version": "0.15.13",
   "description": "an implementation of React that optimizes for small script size",
   "main": "dist/react-lite.common.js",
   "jsnext:main": "src/index.js",
diff --git a/src/ReactDOM.js b/src/ReactDOM.js
@@ -73,9 +73,7 @@ export function render(vnode, container, callback) {
 }
 
 export function unstable_renderSubtreeIntoContainer(parentComponent, subVnode, container, callback) {
-	let context = parentComponent.vnode
-	? parentComponent.vnode.context
-	: parentComponent.$cache.parentContext
+	let context = parentComponent.$cache.parentContext
 	return renderTreeIntoContainer(subVnode, container, callback, context)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*!`
`2`		`- * react-lite.js v0.15.12`
	`2`	`+ * react-lite.js v0.15.13`
`3`	`3`	`* (c) 2016 Jade Gu`
`4`	`4`	`* Released under the MIT License.`
`5`	`5`	`*/`
`@@ -1864,7 +1864,7 @@ function render(vnode, container, callback) {`
`1864`	`1864`	`}`
`1865`	`1865`
`1866`	`1866`	`function unstable_renderSubtreeIntoContainer(parentComponent, subVnode, container, callback) {`
`1867`		`- var context = parentComponent.vnode ? parentComponent.vnode.context : parentComponent.$cache.parentContext;`
	`1867`	`+ var context = parentComponent.$cache.parentContext;`
`1868`	`1868`	`return renderTreeIntoContainer(subVnode, container, callback, context);`
`1869`	`1869`	`}`
`1870`	`1870`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-lite",`
`3`		`- "version": "0.15.12",`
	`3`	`+ "version": "0.15.13",`
`4`	`4`	`"description": "an implementation of React that optimizes for small script size",`
`5`	`5`	`"main": "dist/react-lite.common.js",`
`6`	`6`	`"jsnext:main": "src/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,7 @@ export function render(vnode, container, callback) {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`export function unstable_renderSubtreeIntoContainer(parentComponent, subVnode, container, callback) {`
`76`		`- let context = parentComponent.vnode`
`77`		`- ? parentComponent.vnode.context`
`78`		`- : parentComponent.$cache.parentContext`
	`76`	`+ let context = parentComponent.$cache.parentContext`
`79`	`77`	`return renderTreeIntoContainer(subVnode, container, callback, context)`
`80`	`78`	`}`
`81`	`79`