From a1f550ff5737fcb94a378be0a4fb862f1a696c81 Mon Sep 17 00:00:00 2001 From: Brian Hsu Date: Thu, 12 Feb 2015 17:49:38 -0800 Subject: [PATCH 1/4] Fixed Copyright year from 2014 to 2015 in react.js, ReactDOMIframe.js, and setTextContent.js. --- npm-jsx_orphaned_brackets_transformer/transforms/react.js | 2 +- src/browser/ui/dom/components/ReactDOMIframe.js | 2 +- src/browser/ui/dom/setTextContent.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/npm-jsx_orphaned_brackets_transformer/transforms/react.js b/npm-jsx_orphaned_brackets_transformer/transforms/react.js index 8adda6c773d..7d5037e243f 100644 --- a/npm-jsx_orphaned_brackets_transformer/transforms/react.js +++ b/npm-jsx_orphaned_brackets_transformer/transforms/react.js @@ -1,5 +1,5 @@ /** - * Copyright 2013-2014 Facebook, Inc. + * Copyright 2013-2015 Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/browser/ui/dom/components/ReactDOMIframe.js b/src/browser/ui/dom/components/ReactDOMIframe.js index 706a48f1a6e..0ca52337c3c 100644 --- a/src/browser/ui/dom/components/ReactDOMIframe.js +++ b/src/browser/ui/dom/components/ReactDOMIframe.js @@ -1,5 +1,5 @@ /** - * Copyright 2013-2014, Facebook, Inc. + * Copyright 2013-2015, Facebook, Inc. * All rights reserved. * * This source code is licensed under the BSD-style license found in the diff --git a/src/browser/ui/dom/setTextContent.js b/src/browser/ui/dom/setTextContent.js index 75cbeb046fe..27dd58bf248 100644 --- a/src/browser/ui/dom/setTextContent.js +++ b/src/browser/ui/dom/setTextContent.js @@ -1,5 +1,5 @@ /** - * Copyright 2013-2014 Facebook, Inc. + * Copyright 2013-2015 Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From f08fa42e51606f13d8a40f967505e9aacba75c54 Mon Sep 17 00:00:00 2001 From: Brian Hsu Date: Fri, 13 Feb 2015 07:33:29 -0800 Subject: [PATCH 2/4] Changed the licence of react.js and setTextContent.js to BSD-license. --- .../transforms/react.js | 17 ++++++----------- src/browser/ui/dom/setTextContent.js | 19 ++++++------------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/npm-jsx_orphaned_brackets_transformer/transforms/react.js b/npm-jsx_orphaned_brackets_transformer/transforms/react.js index 7d5037e243f..4a423cadc63 100644 --- a/npm-jsx_orphaned_brackets_transformer/transforms/react.js +++ b/npm-jsx_orphaned_brackets_transformer/transforms/react.js @@ -1,17 +1,12 @@ /** - * Copyright 2013-2015 Facebook, Inc. + * Copyright 2013-2015, Facebook, Inc. + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * 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. + * @providesModule ReactDOMIframe */ /*global exports:true*/ "use strict"; diff --git a/src/browser/ui/dom/setTextContent.js b/src/browser/ui/dom/setTextContent.js index 27dd58bf248..a99f1f7debd 100644 --- a/src/browser/ui/dom/setTextContent.js +++ b/src/browser/ui/dom/setTextContent.js @@ -1,19 +1,12 @@ /** - * Copyright 2013-2015 Facebook, Inc. + * Copyright 2013-2015, Facebook, Inc. + * All rights reserved. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * 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. - * - * @providesModule setTextContent + * @providesModule ReactDOMIframe */ 'use strict'; From 1fcd4e4454846b7f4bb0613d86aaaf05b0266348 Mon Sep 17 00:00:00 2001 From: Brian Hsu Date: Fri, 13 Feb 2015 07:45:14 -0800 Subject: [PATCH 3/4] Fixed the last line of the lincence in react.js and setTextContent.js. --- npm-jsx_orphaned_brackets_transformer/transforms/react.js | 2 +- src/browser/ui/dom/setTextContent.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-jsx_orphaned_brackets_transformer/transforms/react.js b/npm-jsx_orphaned_brackets_transformer/transforms/react.js index 4a423cadc63..2f1b094ad76 100644 --- a/npm-jsx_orphaned_brackets_transformer/transforms/react.js +++ b/npm-jsx_orphaned_brackets_transformer/transforms/react.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule ReactDOMIframe + * @npm-react react */ /*global exports:true*/ "use strict"; diff --git a/src/browser/ui/dom/setTextContent.js b/src/browser/ui/dom/setTextContent.js index a99f1f7debd..9521e6dee95 100644 --- a/src/browser/ui/dom/setTextContent.js +++ b/src/browser/ui/dom/setTextContent.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule ReactDOMIframe + * @Dom setTextCont */ 'use strict'; From 32ad9657dd90210e8cd875ed7ff48d7d29e7e42c Mon Sep 17 00:00:00 2001 From: Brian Hsu Date: Fri, 13 Feb 2015 09:46:52 -0800 Subject: [PATCH 4/4] Changed the last line of licence to the origin state. --- npm-jsx_orphaned_brackets_transformer/transforms/react.js | 3 +-- src/browser/ui/dom/setTextContent.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/npm-jsx_orphaned_brackets_transformer/transforms/react.js b/npm-jsx_orphaned_brackets_transformer/transforms/react.js index 2f1b094ad76..df6687a1476 100644 --- a/npm-jsx_orphaned_brackets_transformer/transforms/react.js +++ b/npm-jsx_orphaned_brackets_transformer/transforms/react.js @@ -6,8 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @npm-react react - */ + * /*global exports:true*/ "use strict"; var Syntax = require('esprima-fb').Syntax; diff --git a/src/browser/ui/dom/setTextContent.js b/src/browser/ui/dom/setTextContent.js index 9521e6dee95..15261302b0a 100644 --- a/src/browser/ui/dom/setTextContent.js +++ b/src/browser/ui/dom/setTextContent.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @Dom setTextCont + * @providesModule setTextContent */ 'use strict';