Skip to content

Commit 6eba9a6

Browse files
committed
Merge branch 'release/3.0.0-beta.1'
2 parents 41d4669 + 6061d13 commit 6eba9a6

19 files changed

+7416
-1409
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["es2015"]
3+
}

.eslintrc

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
// http://eslint.org/docs/rules/
3+
4+
"ecmaFeatures": {
5+
"binaryLiterals": false, // enable binary literals
6+
"blockBindings": true, // enable let and const (aka block bindings)
7+
"defaultParams": false, // enable default function parameters
8+
"forOf": true, // enable for-of loops
9+
"generators": false, // enable generators
10+
"objectLiteralComputedProperties": false, // enable computed object literal property names
11+
"objectLiteralDuplicateProperties": false, // enable duplicate object literal properties in strict mode
12+
"objectLiteralShorthandMethods": false, // enable object literal shorthand methods
13+
"objectLiteralShorthandProperties": false, // enable object literal shorthand properties
14+
"octalLiterals": false, // enable octal literals
15+
"regexUFlag": false, // enable the regular expression u flag
16+
"regexYFlag": false, // enable the regular expression y flag
17+
"templateStrings": true , // enable template strings
18+
"unicodeCodePointEscapes": false, // enable code point escapes
19+
"jsx": false, // enable JSX
20+
"modules": true
21+
},
22+
23+
"env": {
24+
"browser": true, // browser global variables.
25+
"node": true, // Node.js global variables and Node.js-specific rules.
26+
"amd": true, // defines require() and define() as global variables as per the amd spec.
27+
"es6": true // EcmaScript 6
28+
},
29+
30+
"globals": {
31+
// e.g. "angular": true
32+
},
33+
34+
"plugins": [
35+
// e.g. "react" (must run `npm install eslint-plugin-react` first)
36+
],
37+
38+
"rules": {
39+
////////// Possible Errors //////////
40+
41+
"valid-typeof": 2, // Ensure that the results of typeof are compared against a valid string
42+
43+
44+
////////// Best Practices //////////
45+
46+
"eqeqeq": 2, // require the use of === and !==
47+
"no-alert": 2, // disallow the use of alert, confirm, and prompt
48+
49+
////////// Stylistic Issues //////////
50+
51+
"eol-last": 2, // enforce newline at the end of file, with no multiple empty lines
52+
"no-lonely-if": 2, // disallow if as the only statement in an else block (off by default)
53+
"no-mixed-spaces-and-tabs": 2, // disallow mixed spaces and tabs for indentation
54+
"no-multiple-empty-lines": 2, // disallow multiple empty lines (off by default)
55+
"no-trailing-spaces": 2, // disallow trailing whitespace at the end of lines
56+
57+
"quotes": [
58+
2,
59+
"double"
60+
]
61+
}
62+
}

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
node_modules
2+
npm-debug.log
13
RELEASE_MESSAGE*
2-
test*
4+
test/codebirdm.js
5+
test/codebirdt.js
6+
test*.html
37
*.jpg

.travis.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# The Travis setup:
2+
# - run lint for every JS version
3+
# - run testsuite for every JS version
4+
5+
language: node_js
6+
7+
node_js:
8+
- "0.10"
9+
- "0.12"
10+
- iojs
11+
- "8"
12+
- "9"
13+
- "10"
14+
15+
sudo: false
16+
17+
script:
18+
- ./node_modules/eslint/bin/eslint.js codebird.js
19+
- npm test
20+
21+
matrix:
22+
fast_finish: true
23+
24+
# trigger Buildtime Trend Service to parse Travis CI log
25+
notifications:
26+
webhooks:
27+
- https://buildtimetrend.herokuapp.com/travis

CHANGELOG

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
codebird-js - changelog
22
=======================
33

4+
3.0.0 (not yet released)
5+
+ #106 Add error callback
6+
+ #96 Add logout method
7+
+ #98 Support promises as alternative to callbacks
8+
- Drop support for undocumented API methods
9+
+ Add security check hasOwnProperty
10+
+ #110 Add support for Collections API
11+
+ Transform codebase to EcmaScript 7
12+
+ #25 Add unit testing suite
13+
+ Add POST statuses/unretweet/:id
14+
+ #116 Update GET statuses/oembed with new endpoint
15+
+ Support POST media/upload with media_data base64
16+
- Fix check for require for webpack compatibility
17+
+ Add Account Activity API methods
18+
+ Add new Direct Messages API
19+
- Remove sunsetting Direct Messages API
20+
- Remove contributor API methods
21+
- Remove deprecated statuses/update_with_media method
22+
- Remove deprecated statuses/update_profile_background_image method
23+
424
2.6.0 (2015-04-08)
525
+ Allow to get the supported API methods as array
626
- #79 Use POST for users/lookup and statuses/lookup, params may get too long for GET

CONTRIBUTING.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
- Normal bugs are fixed in the develop branch.
44
- New features are added to the develop branch, too.
55

6+
### Which file?
7+
- Please apply all edits to the `codebird.es7.js` file.
8+
The codebird.js file is transpiled from it using BabelJS.
9+
610
### Code style
7-
- Please use 4 soft spaces per indent level.
8-
- Take a look at the coding style used in codebird.js and apply the same convention to your contributed code.
11+
- Please use 2 soft spaces per indent level.
12+
- Take a look at the coding style used in `codebird.es7.js` and apply the same convention to your contributed code.
913

1014
### License
1115
- Code contributed by you will get the same license as Codebird itself, that is, GPU General Public License V3.

0 commit comments

Comments
 (0)