Skip to content

Commit

Permalink
Merge pull request #2 from macacajs/tweak-project
Browse files Browse the repository at this point in the history
tweak project
  • Loading branch information
xudafeng committed Aug 28, 2016
2 parents e6f3e57 + 1850208 commit 61259b5
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 69 deletions.
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
.DS_Store
node_modules
npm-debug.log
*.swp
*.swo
*.swn
*.swl
*.swm
.sw*
*.sw*
*.un~
.idea/*
Thumbs.db
coverage/
.project
build/
build/
8 changes: 2 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,5 @@ Makefile
.jshintrc
.jshintignore
coverage/
*.swp
*.swo
*.swn
*.swl
*.swm
.sw*
*.sw*
*.un~
34 changes: 18 additions & 16 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
The MIT License (MIT)
MIT LICENSE

Copyright (c) 2015 xdf
Copyright (c) 2016-present Alipay.com, https://www.alipay.com/

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, 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.
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@

[npm-image]: https://img.shields.io/npm/v/driver-base.svg?style=flat-square
[npm-url]: https://npmjs.org/package/driver-base
[travis-image]: https://img.shields.io/travis/xudafeng/driver-base.svg?style=flat-square
[travis-url]: https://travis-ci.org/xudafeng/driver-base
[coveralls-image]: https://img.shields.io/coveralls/xudafeng/driver-base.svg?style=flat-square
[coveralls-url]: https://coveralls.io/r/xudafeng/driver-base?branch=master
[travis-image]: https://img.shields.io/travis/macacajs/driver-base.svg?style=flat-square
[travis-url]: https://travis-ci.org/macacajs/driver-base
[coveralls-image]: https://img.shields.io/coveralls/macacajs/driver-base.svg?style=flat-square
[coveralls-url]: https://coveralls.io/r/macacajs/driver-base?branch=master
[node-image]: https://img.shields.io/badge/node.js-%3E=_0.10-green.svg?style=flat-square
[node-url]: http://nodejs.org/download/
[download-image]: https://img.shields.io/npm/dm/driver-base.svg?style=flat-square
[download-url]: https://npmjs.org/package/driver-base

> driver-base
> driver base
## Installment

Expand All @@ -28,5 +28,3 @@ $ npm i driver-base --save
## License

The MIT License (MIT)

Copyright (c) 2015 xdf
13 changes: 0 additions & 13 deletions lib/driver-base.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
/* ================================================================
* driver-base by xdf(xudafeng[at]126.com)
*
* first created at : Mon Feb 29 2016 20:05:25 GMT+0800 (CST)
*
* ================================================================
* Copyright xdf
*
* Licensed under the MIT License
* You may not use this file except in compliance with the License.
*
* ================================================================ */

'use strict';

const errors = require('webdriver-dfn-error-code').errors;
Expand Down
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "driver-base",
"version": "0.1.1",
"version": "0.1.2",
"description": "driver-base",
"keywords": [
"driver-base"
],
"main": "./lib/driver-base",
"repository": {
"type": "git",
"url": "git://github.com/xudafeng/driver-base.git"
"url": "git://github.com/macacajs/driver-base.git"
},
"dependencies": {
"webdriver-dfn-error-code": "~1.0.1"
Expand All @@ -28,9 +28,6 @@
"pre-commit": [
"jshint"
],
"homepage": "https://github.com/xudafeng/driver-base",
"author": "xudafeng",
"email": "xudafeng@126.com",
"blog": "http://xdf.me",
"homepage": "https://github.com/macacajs/driver-base",
"license": "MIT"
}
15 changes: 1 addition & 14 deletions test/driver-base.test.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
/* ================================================================
* driver-base by xdf(xudafeng[at]126.com)
*
* first created at : Mon Feb 29 2016 20:05:25 GMT+0800 (CST)
*
* ================================================================
* Copyright xdf
*
* Licensed under the MIT License
* You may not use this file except in compliance with the License.
*
* ================================================================ */

'use strict';

var DriverBase = require('..');
Expand All @@ -21,4 +8,4 @@ describe('Test', function() {
DriverBase.should.be.ok;
});

});
});

0 comments on commit 61259b5

Please sign in to comment.