Skip to content

Commit f104770

Browse files
committed
Merge v2 to master
1 parent 1764d6b commit f104770

File tree

1,486 files changed

+265974
-126284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,486 files changed

+265974
-126284
lines changed

.editorconfig

+1-15
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,7 @@ root = true
66
[*]
77
charset = utf-8
88
end_of_line = lf
9-
indent_size = 4
9+
indent_size = 2
1010
indent_style = space
1111
insert_final_newline = true
1212
trim_trailing_whitespace = true
13-
14-
[*.json]
15-
indent_size = 2
16-
17-
[*.md]
18-
indent_size = 2
19-
20-
[*.html]
21-
indent_size = 2
22-
trim_trailing_whitespace = false
23-
24-
[*.jade]
25-
indent_size = 2
26-
trim_trailing_whitespace = false

.eslintignore

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
build
2+
.git
3+
.github
4+
custom
5+
dist
6+
kitchen-sink
7+
node_modules
8+
src/framework7.js
9+
src/modules/demo-module.js
10+
src/components/swiper/swiper-class

.eslintrc.js

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
module.exports = {
2+
'extends': 'airbnb-base',
3+
'plugins': [
4+
"import"
5+
],
6+
'globals': {
7+
"window": true,
8+
"document": true,
9+
"XMLHttpRequest": true,
10+
"Blob": true,
11+
"Document": true,
12+
"FormData": true,
13+
},
14+
rules: {
15+
'max-len': ['error', 1000, 2, {
16+
ignoreUrls: true,
17+
ignoreComments: false,
18+
ignoreRegExpLiterals: true,
19+
ignoreStrings: true,
20+
ignoreTemplateLiterals: true,
21+
}],
22+
'object-curly-newline': ['error', {
23+
ObjectExpression: { minProperties: 9, multiline: true, consistent: true },
24+
ObjectPattern: { minProperties: 9, multiline: true, consistent: true }
25+
}],
26+
'comma-dangle': ['error', {
27+
arrays: 'always-multiline',
28+
objects: 'always-multiline',
29+
imports: 'always-multiline',
30+
exports: 'always-multiline',
31+
functions: 'never',
32+
}],
33+
'prefer-destructuring': ['off'],
34+
},
35+
};

.github/CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Framework7 loves to welcome your contributions. There are several ways to help out:
44

5-
* Create an [issue](https://github.com/nolimits4web/Framework7/issues) on GitHub, if you have found a bug
5+
* Create an [issue](https://github.com/framework7io/Framework7/issues) on GitHub, if you have found a bug
66
* Write test cases or provide examples for open bug issues
77
* Write patches for open bug/feature issues, preferably with test cases included
8-
* Contribute to the [documentation](https://github.com/nolimits4web/Framework7-Website)
8+
* Contribute to the [documentation](https://github.com/framework7io/Framework7-Website)
99

1010
There are a few guidelines that we need contributors to follow so that we have a
1111
chance of keeping on top of things.
@@ -14,7 +14,7 @@ chance of keeping on top of things.
1414
## Getting Started
1515

1616
* Make sure you have a [GitHub account](https://github.com/signup/free).
17-
* Submit an [issue](https://github.com/nolimits4web/Framework7/issues), assuming one does not already exist.
17+
* Submit an [issue](https://github.com/framework7io/Framework7/issues), assuming one does not already exist.
1818
* Clearly describe the issue including steps to reproduce when it is a bug.
1919
* Make sure you fill in the earliest version that you know has the issue.
2020
* Include live link or JSFiddle/Codepen link with the issue if you want it to be discovered and resolved asap. We have few ready templates for you: iOS [JSFiddle](https://jsfiddle.net/s2n1p730/)/[Codepen](https://codepen.io/nolimits4web/pen/WRRWwN), Material [JSFiddle](https://jsfiddle.net/0ogxxcvt/)/[Codepen](https://codepen.io/nolimits4web/pen/pEPPPK)

.github/ISSUE_TEMPLATE.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<!--
2+
3+
Do you want to ask a question? Are you looking for support? The Framework7 forum (http://forum.framework7.io) and Stack Overflow (http://stackoverflow.com/questions/tagged/framework7) are the best places for getting support
4+
5+
-->
6+
17
This is a (multiple allowed):
28
* [x] bug
39
* [ ] enhancement

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ custom
55
npm-debug.log
66
.idea
77
.vscode
8-
nbproject
9-
dist/css/framework7.css
8+
scripts/build-config-custom.js
9+
scripts/build-config-*.js

.jshintrc

-37
This file was deleted.

.npmignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
.github
33
build
44
custom
5+
kitchen-sink
56
kitchen-sink-ios
67
kitchen-sink-material
78
node_modules
8-
npm-debug.log
9+
npm-debug.log
10+
scripts
11+
src
12+
gulpfile.js

0 commit comments

Comments
 (0)