Skip to content

Commit

Permalink
Merge branch 'master-remote'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bruno Grácio committed Dec 7, 2016
2 parents 05987b4 + 31e2eda commit c535209
Show file tree
Hide file tree
Showing 18 changed files with 493 additions and 166 deletions.
13 changes: 13 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2016 Woon Tien Jing

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

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.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
**This repository is looking for a maintainer! If you believe you are the right person, please [leave a comment](https://github.com/tjwoon/csZBar/issues/60)!**



# ZBar Barcode Scanner Plugin

:warning: This plugin is SUPPORTED by OutSystems. Customers entitled to Support Services may obtain assistance through Support.

This plugin integrates with the [ZBar](http://zbar.sourceforge.net/) library,
exposing a JavaScript interface for scanning barcodes (QR, 2D, etc).
In this fork a button has been added to turn off and on device flash. In addition the plugin can now handle the device orientation change.

## Installation

cordova plugins add org.cloudsky.cordovaplugins.zbar

## License

This plugin is released under the Apache 2.0 license, but the ZBar library on which it depends (and which is distribute with this plugin) is under the LGPL license (2.1).
cordova plugin add cordova-plugin-cszbar

## API

Expand Down Expand Up @@ -47,11 +48,10 @@ Status:
- Android: DONE
- iOS: DONE

Quirks:

- __Android__: On Android API Level < 14, flash "on" may cause the flash to
alternate between on and off at about a half second/one second interval,
instead of making it stay on...
## LICENSE [Apache 2.0](LICENSE.md)

This plugin is released under the Apache 2.0 license, but the ZBar library on which it depends (and which is distribute with this plugin) is under the LGPL license (2.1).


## Thanks
Expand Down
Loading

0 comments on commit c535209

Please sign in to comment.