Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": ["eslint:recommended", "prettier"],
"parserOptions": {
"ecmaVersion": 12,
"sourceType": "module"
},
"rules": {
"no-irregular-whitespace": [
"error",
{
"skipComments": true
}
]
}
}
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
node-version: '14'
- run: npm ci
- run: npm run build
- run: npm test
- run: npm test
23 changes: 0 additions & 23 deletions .jshintrc

This file was deleted.

2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist
docs
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ singleQuote: true, tabWidth: 2, trailingComma: none, useTabs: true }
38 changes: 19 additions & 19 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ First, a couple of ground rules.

1. Make sure you have a [GitHub account](https://github.com/signup/free).
2. [Submit a ticket for your issue](https://github.com/OpenF2/F2/issues), assuming one does not already exist. **(Search first!)**
* Clearly describe the issue including steps to reproduce when it is a bug.
* Include the F2 version number.
- Clearly describe the issue including steps to reproduce when it is a bug.
- Include the F2 version number.
3. [Fork the F2 repository](https://github.com/OpenF2/F2/fork).

## New to GitHub?
Expand All @@ -26,7 +26,7 @@ GitHub has terrific [Guides](http://guides.github.com/) to help developers throu

### Understanding the "wip" branch

The latest F2 changes can be found in the `*-wip` branch. This branch's name uses the upcoming version number followed by `-wip` which stands for "work-in-progress", for example `1.3.1-wip` as shown below. There *should* only be one `-wip` branch at any given time.
The latest F2 changes can be found in the `*-wip` branch. This branch's name uses the upcoming version number followed by `-wip` which stands for "work-in-progress", for example `1.3.1-wip` as shown below. There _should_ only be one `-wip` branch at any given time.

Do not work directly in `master`!

Expand All @@ -36,21 +36,21 @@ Do not work directly in `master`!

Once you've forked the F2 repository:

1. Create a new branch in your fork from the next version `*-wip` branch. Do not work directly in `master`!
* `$> git checkout -b 'your_branch_name' *-wip`
3. Read the F2 [coding standards](https://github.com/OpenF2/F2/wiki/Coding-Standards).
4. Add and document unit test(s) for your changes. **At least one unit test is required** for new or changed functionality.
5. Re-run all the Jasmine tests to confirm your changes didn't break anything. `$> npm test` and/or `$> npm run test-live`
6. Perform browser testing in [supported browsers](https://github.com/OpenF2/F2/wiki/Browser-Compatibility).
1. Create a new branch in your fork from the next version `*-wip` branch. Do not work directly in `master`!
- `$> git checkout -b 'your_branch_name' *-wip`
2. Read the F2 [coding standards](https://github.com/OpenF2/F2/wiki/Coding-Standards).
3. Add and document unit test(s) for your changes. **At least one unit test is required** for new or changed functionality.
4. Re-run all the Jasmine tests to confirm your changes didn't break anything. `$> npm test` and/or `$> npm run test-live`
5. Perform browser testing in [supported browsers](https://github.com/OpenF2/F2/wiki/Browser-Compatibility).

### Committing Changes

* You should only commit files you have changed. **Do not commit compiled or generated F2 files**
* After you've staged your changes, add a detailed commit message.
* Push committed changes to your fork's branch.
* [Submit a pull request](https://help.github.com/articles/using-pull-requests) for `F2\*-wip` **not** `F2\master`.
* Add a message or additional detail for your changes in the pull request comments.
* Wait for your change(s) to be reviewed.
- You should only commit files you have changed. **Do not commit compiled or generated F2 files**
- After you've staged your changes, add a detailed commit message.
- Push committed changes to your fork's branch.
- [Submit a pull request](https://help.github.com/articles/using-pull-requests) for `F2\*-wip` **not** `F2\master`.
- Add a message or additional detail for your changes in the pull request comments.
- Wait for your change(s) to be reviewed.

## Coding Standards

Expand All @@ -66,7 +66,7 @@ If you have any questions while writing code to contribute to F2, post a message

## Resources

* [F2 Google Group](https://groups.google.com/forum/#!forum/OpenF2)
* [F2 Coding Standards](https://github.com/OpenF2/F2/wiki/Coding-Standards)
* [GitHub Documentation: Using Pull Requests](https://help.github.com/articles/using-pull-requests)
* [GitHub Documentation](https://help.github.com/)
- [F2 Google Group](https://groups.google.com/forum/#!forum/OpenF2)
- [F2 Coding Standards](https://github.com/OpenF2/F2/wiki/Coding-Standards)
- [GitHub Documentation: Using Pull Requests](https://help.github.com/articles/using-pull-requests)
- [GitHub Documentation](https://help.github.com/)
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ Join the team and help contribute to F2 on GitHub. Begin by reading our [contrib

### Get F2.js

* Choose a [F2.js package](http://docs.openf2.org/f2js-sdk.html#packages), including [F2.basic.js](https://raw.github.com/OpenF2/F2/master/sdk/packages/f2.basic.min.js) (7kb, minified and gzipped)
* Grab any version of F2 [on cdnjs.com](http://cdnjs.com/libraries/F2/).
* For .NET developers: install the [NuGet Package](https://nuget.org/packages/F2/) or `PM> Install-Package F2`
* Bower: `bower install F2`
- Choose a [F2.js package](http://docs.openf2.org/f2js-sdk.html#packages), including [F2.basic.js](https://raw.github.com/OpenF2/F2/master/sdk/packages/f2.basic.min.js) (7kb, minified and gzipped)
- Grab any version of F2 [on cdnjs.com](http://cdnjs.com/libraries/F2/).
- For .NET developers: install the [NuGet Package](https://nuget.org/packages/F2/) or `PM> Install-Package F2`
- Bower: `bower install F2`

### Docs

Expand Down Expand Up @@ -81,7 +81,6 @@ Copyright © 2015 Markit On Demand, Inc.

[http://www.apache.org/licenses/LICENSE-2.0](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.

Please note that F2 ("Software") may contain third party material that Markit On Demand Inc. has a license to use and include within the Software (the "Third Party Material"). A list of the software comprising the Third Party Material and the terms and conditions under which such Third Party Material is distributed are reproduced in the [ThirdPartyMaterial.md](ThirdPartyMaterial.md) file. The inclusion of the Third Party Material in the Software does not grant, provide nor result in you having acquiring any rights whatsoever, other than as stipulated in the terms and conditions related to the specific Third Party Material, if any.
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.

Please note that F2 ("Software") may contain third party material that Markit On Demand Inc. has a license to use and include within the Software (the "Third Party Material"). A list of the software comprising the Third Party Material and the terms and conditions under which such Third Party Material is distributed are reproduced in the [ThirdPartyMaterial.md](ThirdPartyMaterial.md) file. The inclusion of the Third Party Material in the Software does not grant, provide nor result in you having acquiring any rights whatsoever, other than as stipulated in the terms and conditions related to the specific Third Party Material, if any.
7 changes: 3 additions & 4 deletions ThirdPartyMaterial.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


## lodash

The MIT License
Expand Down Expand Up @@ -82,7 +81,7 @@ terms above.

Hij1nx requires the following notice to accompany EventEmitter:

Copyright © 2011 hij1nx
Copyright © 2011 hij1nx

[http://www.twitter.com/hij1nx](http://www.twitter.com/hij1nx)

Expand All @@ -94,7 +93,7 @@ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

## fetch-jsonp

Copyright (c) 2021 Cam Song - https://github.com/camsong/fetch-jsonp
Copyright (c) 2021 Cam Song - https://github.com/camsong/fetch-jsonp

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -112,4 +111,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
8 changes: 2 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"name": "f2",
"description": "F2 is an open and free web integration framework that allows you to deploy apps & components both within your existing web application and cross-domain.",
"keywords": [
"f2",
"openf2",
"markit f2"
],
"keywords": ["f2", "openf2", "markit f2"],
"homepage": "http://www.openf2.org",
"version": "1.4.5",
"main": "dist/f2.js",
Expand All @@ -32,4 +28,4 @@
"type": "git",
"url": "git://github.com/OpenF2/F2.git"
}
}
}
Loading