Skip to content
This repository was archived by the owner on Sep 15, 2021. It is now read-only.

Commit 5809fe4

Browse files
committed
Merge commit 'cf172bdd6bb227311591eb393e8a3f177b22fae3'
* commit 'cf172bdd6bb227311591eb393e8a3f177b22fae3': (83 commits) Revert "test($cordovaBarcodeScanner): add unit tests" test($cordovaSms): add unit tests test($cordovaPrinter): add unit tests test($cordovaNetwork): add unit tests test($cordovaKeyboard): add unit tests test($cordovaSpinnerDialog): add unit tests test($cordovaSplashscreen): add unit tests fix($cordovaVibration): replace service name in test test($cordovaBarcodeScanner): add unit tests chore(*): remove empty test files test($cordovaAppAvailability): add unit tests chore(*): add _site to .gitignore test($cordovaVibration): add unit test update($cordovaBackgroundGeolocation): adds install and link urls feat(gulp): add base for js-lint testing lets add a mock test as well #225 vibration was never fired - well a function need to be bound to $scope feat(editorconfig): add an editorconfig file implementation of a datapicker plugin #225 docs($cordovaNativeAudio): add install and link ... Conflicts: README.md demo/init.sh dist/ng-cordova.js dist/ng-cordova.min.js src/plugins/module.js src/plugins/nativeAudio.js
2 parents 08981e1 + cf172bd commit 5809fe4

File tree

1,610 files changed

+564113
-53425
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,610 files changed

+564113
-53425
lines changed

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
.*.sw*
22
node_modules/
3-
.idea/*
3+
.idea/*
4+
demo/platforms/*
5+
demo/plugins/*
6+
_site

CHANGELOG.md

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
### 0.1.3-alpha (06-11-2014)
2+
3+
4+
#### NEW
5+
6+
- API Change for Geolocation, DeviceMotion, and DeviceOrientation plugins. They now return an object of the form:
7+
```javascript
8+
{
9+
promise: deferrable,
10+
watchId: watchId
11+
}
12+
```
13+
14+
Where promise is the internal promise, and watchId is the watchId that can be used to clear the watch later.
15+
16+
- [Capture](https://github.com/apache/cordova-plugin-media-capture) plugin
17+
- [Flashlight](https://github.com/EddyVerbruggen/Flashlight-PhoneGap-Plugin) plugin
18+
- [AppAvailability](https://github.com/ohh2ahh/AppAvailability) plugin
19+
- Cordova preferences plugin
20+
21+
And lots of fixes!
22+
23+
----
24+
25+
### 0.1.2-alpha (06-11-2014)
26+
27+
#### NEW
28+
29+
- Bower support
30+
- File Plugin
31+
- Globalization plugin.
32+
- Google Analytics plugin
33+
- Local Notifications Plugin
34+
- Pin Dialog plugin
35+
- Push Notifications plugin
36+
- Social Sharing plugin
37+
- Spinner Dialog plugin
38+
- SQLite Plugin
39+
- Toast Plugin
40+
41+
42+
#### FEATURES
43+
44+
- Progress event to **File Plugin** `upload()` + `download()`
45+
- More commands in **Push Notification plugin**
46+
- Handle `Connection.NONE` in **Network Information Plugin** for is`Offline()`
47+
- Use `notify` not `resolve` with `watchHeading`
48+
49+
50+
#### FIXES
51+
52+
- Remove options in **BarcodeScanner** : `scan()`
53+
- Remove options in **Device Motion** : `getCurrentAcceleration()`
54+
55+
56+
----
57+
58+
### 0.1.1-alpha (06-03-2014)
59+
60+
#### NEW
61+
- StatusBar
62+
63+
#### FIXES
64+
- Renamed Accelerometer and Compass to deviceMotion and deviceOrientation, respectively
65+
66+
----
67+
68+
### 0.1.0-alpha (06-03-2014)
69+
70+
ngCordova is ready for some bleeding edge testing. So far we support the following Cordova plugins:
71+
72+
- org.apache.cordova.console
73+
- org.apache.cordova.device
74+
- org.apache.cordova.camera
75+
- org.apache.cordova.vibration
76+
- org.apache.cordova.network-information
77+
- org.apache.cordova.geolocation
78+
- org.apache.cordova.dialogs
79+
- org.apache.cordova.device-motion
80+
- org.apache.cordova.splashscreen
81+
- org.apache.cordova.device-orientation
82+
- org.apache.cordova.contacts
83+
- https://github.com/driftyco/ionic-plugins-keyboard
84+
- https://github.com/wildabeast/BarcodeScanner
85+
86+
87+
Give it a try, and please report lots of issues and contribute PRs. :icecream:

CONTRIBUTING.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
## Contributing
2+
3+
#### Creating an Issue
4+
5+
If you have a problem with ng-cordova, you can [submit a new Issue](https://github.com/driftyco/ng-cordova/issues/new). Please be detailed in your issue report, and include keywords such as : `Feat`, `Bug`, etc
6+
7+
If you think you have found a bug, or have a new feature idea, please start by making sure it hasn't already been reported. You can [search through existing issues](https://github.com/driftyco/ng-cordova/issues?state=open) to see if someone's reported one similar to yours.
8+
9+
10+
#### Making edits to ng-cordova
11+
12+
1. [Fork](https://github.com/driftyco/ng-cordova/fork) then clone `git clone [email protected]:your-username/ng-cordova.git` ng-cordova repository
13+
2. Create a new branch in your personally forked repo, with a name similar to your edits, such as `fix-facebook-plugin`
14+
3. Make your edits inside your new branch
15+
4. Commit them and push them back to your personal github fork
16+
5. Make a new [Pull Request](https://github.com/driftyco/ng-cordova/compare/) on the ng-cordova repo. Point your branch to the `master` ng-cordova branch and submit
17+
18+
19+
#### Fix the Docs
20+
21+
1. [Fork](https://github.com/driftyco/ng-cordova/fork) and clone
22+
2. Create a new branch from the `gh-pages` branch
23+
3. Make your edits
24+
4. Push your edits back to your personal github repo
25+
5. Make a [Pull Request](https://github.com/driftyco/ng-cordova/compare/) on the ng-cordova repo. Point your branch to the `gh-pages` branch and submit
26+
27+
28+
##### License
29+
30+
By contributing your code to the driftyco/ionic GitHub Repository, you agree to license your contribution under the MIT license.

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ org.apache.cordova.network-information
2828
org.apache.cordova.splashscreen
2929
org.apache.cordova.statusbar
3030
org.apache.cordova.vibration
31+
org.apache.cordova.battery-status
3132
https://github.com/Paldom/PinDialog.git
3233
https://github.com/phonegap-build/PushPlugin.git
3334
https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin.git
@@ -41,5 +42,7 @@ https://github.com/EddyVerbruggen/Flashlight-PhoneGap-Plugin
4142
https://github.com/apache/cordova-plugin-media-capture
4243
https://github.com/ohh2ahh/AppAvailability
4344
https://github.com/dferrell/plugins-application-preferences
44-
https://github.com/SidneyS/cordova-plugin-nativeaudio
45+
https://github.com/shazron/KeychainPlugin.git
46+
https://github.com/katzer/cordova-plugin-printer
47+
https://github.com/aharris88/phonegap-sms-plugin
4548
```

bower.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
{
22
"name": "ngCordova",
3-
"version": "0.1.2-alpha",
3+
"version": "0.1.3-alpha",
44
"homepage": "http://ngCordova.com/",
55
"authors": [
66
"Max Lynch <[email protected]>",
7-
"Paolo Bernasconi <[email protected]>"
7+
"Paolo Bernasconi <[email protected]>",
8+
"Chad Campbell <[email protected]>"
89
],
910
"description": "AngularJS Cordova wrappers for common Cordova plugins.",
10-
"main": "./dist/ng-cordova.js",
11+
"main": [
12+
"./dist/ng-cordova.js",
13+
"./dist/ng-cordova.min.js"
14+
],
15+
"ignore" : [
16+
"**/.*",
17+
"gulpfile.js",
18+
"test",
19+
"src",
20+
"config"
21+
],
22+
"dependencies": {
23+
"angular": "1.2.0"
24+
},
1125
"keywords": [
26+
"ngCordova",
1227
"cordova",
1328
"phonegap",
1429
"angular",
@@ -18,4 +33,4 @@
1833
],
1934
"license": "MIT",
2035
"private": false
21-
}
36+
}

config/build.config.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,20 @@ module.exports = {
88
' * Copyright 2014 Drifty Co. http://drifty.com/\n' +
99
' * See LICENSE in this repository for license information\n' +
1010
' */\n',
11+
1112
closureStart: '(function(){\n',
1213
closureEnd: '\n})();',
1314

1415
dist: 'dist',
16+
pluginFiles: [
17+
'src/module.js',
18+
'src/plugins/*.js'
19+
],
1520

16-
jsFiles: ['src/**/*.js'],
21+
mockFiles: [
22+
'src/module-mocks.js',
23+
'src/mocks/*.js'
24+
],
1725

1826
versionData: {
1927
version: pkg.version

config/karma.conf.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ module.exports = {
77
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js',
88
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-mocks.js'
99
]
10-
.concat(buildConfig.jsFiles)
11-
.concat('test/**/*.js'),
10+
.concat(buildConfig.pluginFiles)
11+
.concat('test/plugins/*.js')
12+
13+
.concat(buildConfig.mockFiles)
14+
.concat('test/mocks/*.js')
15+
,
1216

1317
frameworks: ['jasmine'],
1418
reporters: ['progress'],
File renamed without changes.

demo/app/.bowerrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)