Skip to content

Commit

Permalink
更换开源协议
Browse files Browse the repository at this point in the history
  • Loading branch information
RubyLouvre committed Aug 16, 2017
1 parent bcb8fdd commit e5dde19
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 38 deletions.
9 changes: 4 additions & 5 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

Apache License
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Expand Down Expand Up @@ -179,15 +178,15 @@
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2016 Software Freedom Conservancy (SFC)
Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -199,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
9 changes: 9 additions & 0 deletions LICENSE.CN
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Apache Licence是著名的非盈利开源组织Apache采用的协议。该协议和BSD类似,同样鼓励代码共享和尊重原作者的著作权,同样允许代码修改,再发布(作为开源或商业软件)。需要满足的条件也和BSD类似:

需要给代码的用户一份Apache Licence
如果你修改了代码,需要在被修改的文件中说明。
在延伸的代码中(修改和有源代码衍生的代码中)需要带有原来代码中的协议,商标,专利声明和其他原来作者规定需要包含的说明。
如果再发布的产品中包含一个Notice文件,则在Notice文件中需要带有Apache Licence。你可以在Notice中增加自己的许可,但不可以表现为对Apache Licence构成更改。
Apache Licence也是对商业应用友好的许可。使用者也可以在需要的时候修改代码来满足需要并作为开源或商业产品发布/销售。

英文原文:http://www.apache.org/licenses/LICENSE-2.0.html
8 changes: 0 additions & 8 deletions dist/React.js
Original file line number Diff line number Diff line change
Expand Up @@ -602,15 +602,8 @@ function setStateImpl(state, cb) {
});
}
} else if (!this.__dirty && (this.__dirty = true)) {
//在DidMount钩子执行之前被子组件调用了setState方法
options.refreshComponent(this, []);
}
/* defer(() => {
if (this.__dirty) {
console.log(this.constructor.name, "异步被刷新2");
options.refreshComponent(this, []);
}
});*/
}
}

Expand Down Expand Up @@ -1582,7 +1575,6 @@ function disposeElement(vnode) {
function disposeComponent(vnode) {
var instance = vnode._instance;
if (instance) {
instance._disposed = true;
options.beforeUnmount(instance);
if (instance.componentWillUnmount) {
instance.componentWillUnmount();
Expand Down
8 changes: 0 additions & 8 deletions dist/ReactIE.js
Original file line number Diff line number Diff line change
Expand Up @@ -601,15 +601,8 @@ function setStateImpl(state, cb) {
});
}
} else if (!this.__dirty && (this.__dirty = true)) {
//在DidMount钩子执行之前被子组件调用了setState方法
options.refreshComponent(this, []);
}
/* defer(() => {
if (this.__dirty) {
console.log(this.constructor.name, "异步被刷新2");
options.refreshComponent(this, []);
}
});*/
}
}

Expand Down Expand Up @@ -1568,7 +1561,6 @@ function disposeElement(vnode) {
function disposeComponent(vnode) {
var instance = vnode._instance;
if (instance) {
instance._disposed = true;
options.beforeUnmount(instance);
if (instance.componentWillUnmount) {
instance.componentWillUnmount();
Expand Down
8 changes: 0 additions & 8 deletions dist/ReactShim.js
Original file line number Diff line number Diff line change
Expand Up @@ -603,15 +603,8 @@ function setStateImpl(state, cb) {
});
}
} else if (!this.__dirty && (this.__dirty = true)) {
//在DidMount钩子执行之前被子组件调用了setState方法
options.refreshComponent(this, []);
}
/* defer(() => {
if (this.__dirty) {
console.log(this.constructor.name, "异步被刷新2");
options.refreshComponent(this, []);
}
});*/
}
}

Expand Down Expand Up @@ -1348,7 +1341,6 @@ function disposeElement(vnode) {
function disposeComponent(vnode) {
var instance = vnode._instance;
if (instance) {
instance._disposed = true;
options.beforeUnmount(instance);
if (instance.componentWillUnmount) {
instance.componentWillUnmount();
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react-like"
],
"author": "RubyLouvre",
"license": "BSD-3-Clause",
"license": "Apache License 2.0",
"bugs": {
"url": "https://github.com/RubyLouvre/anu/issues"
},
Expand Down
2 changes: 2 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ QQ交流学习群: 370262116
2. ReactIE 支持IE6+, 拥有PropTypes, createClass, createFactory (需要与lib目录下的polyfill配套使用)
3. ReactShim 要求浏览器支持es6 Map对象,并且与react1.6靠近,删除了PropTypes, createClass, createFactory

### 开源协议
Apache Licene 2.0

### 低版本浏览器可能需要以下 语言补丁

Expand Down
7 changes: 0 additions & 7 deletions src/Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,8 @@ function setStateImpl(state, cb) {
});
}
} else if (!this.__dirty && (this.__dirty = true)) {
//在DidMount钩子执行之前被子组件调用了setState方法
options.refreshComponent(this, []);
}
/* defer(() => {
if (this.__dirty) {
console.log(this.constructor.name, "异步被刷新2");
options.refreshComponent(this, []);
}
});*/
}
}

Expand Down
1 change: 0 additions & 1 deletion src/dispose.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ function disposeElement(vnode) {
function disposeComponent(vnode) {
var instance = vnode._instance;
if (instance) {
instance._disposed = true;
options.beforeUnmount(instance);
if (instance.componentWillUnmount) {
instance.componentWillUnmount();
Expand Down

0 comments on commit e5dde19

Please sign in to comment.