Maintenance:

pull/18/head
Lars Jung 11 years ago
parent b39b9f21da
commit c9f9007037

3
.gitignore vendored

@ -1,4 +1,5 @@
bower_components
build
local
*.sublime-*
node_modules

@ -1,19 +0,0 @@
Copyright (c) 2014 Lars Jung, http://larsjung.de
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 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.

@ -1,19 +1,57 @@
# jQuery.qrcode
* Website with download, docs and demo: <http://larsjung.de/qrcode/>
* Sources: <https://github.com/lrsjng/jQuery.qrcode>
[![web][web-img]][web] [![GitHub][github-img]][github] [![bower][bower-img]][github]
jQuery.qrcode is provided under the terms of the [MIT License](https://github.com/lrsjng/jQuery.qrcode/blob/develop/LICENSE.md).
It makes use of [QR Code Generator](http://www.d-project.com/qrcode/index.html) (MIT).
Kudos to [jquery.qrcode.js](https://github.com/jeromeetienne/jquery-qrcode).
jQuery plugin to dynamically generate QR codes.
For bug reports and feature requests please use [issues][github-issues].
## License
The MIT License (MIT)
Copyright (c) 2014 Lars Jung (http://larsjung.de)
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 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.
## References
jQuery.qrcode uses [QR Code Generator][qrcode] (MIT).
[web]: http://larsjung.de/qrcode/
[github]: https://github.com/lrsjng/jquery.qrcode
[github-issues]: https://github.com/lrsjng/modulejs/issues
[web-img]: http://img.shields.io/badge/web-larsjung.de/qrcode-a0a060.svg?style=flat
[github-img]: http://img.shields.io/badge/GitHub-lrsjng/jquery.qrcode-a0a060.svg?style=flat
[bower-img]: http://img.shields.io/badge/bower-jquery.qrcode-a0a060.svg?style=flat
[qrcode]: http://www.d-project.com/qrcode/index.html
## Changelog
### develop branch
### v0.8.1 - *2014-08-09*
* ...
* maintenance
### v0.8.0 - *2014-07-07*

@ -1,25 +1,27 @@
{
"name": "jquery.qrcode",
"version": "0.8.0+",
"version": "0.9.0",
"description": "generate QR codes dynamically",
"homepage": "http://larsjung.de/qrcode/",
"authors": [
"Lars Jung <lrsjng@gmail.com>"
"Lars Jung <lrsjng@gmail.com> (http://larsjung.de)"
],
"description": "generate QR codes dynamically",
"license": "MIT",
"main": "dist/jquery.qrcode.js",
"keywords": [
"jquery",
"javascript",
"qrcode"
],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests",
"build",
"local"
"local",
"makefile.js",
"node_modules",
"src",
"test",
"tests"
]
}

@ -1,7 +1,4 @@
/*! jQuery.qrcode 0.8.0 - //larsjung.de/qrcode - MIT License */
// Uses [QR Code Generator](http://www.d-project.com/qrcode/index.html) (MIT), appended to the end of this file.
// Kudos to [jquery.qrcode.js](http://github.com/jeromeetienne/jquery-qrcode) (MIT).
/*! jQuery.qrcode 0.9.0 - //larsjung.de/qrcode (MIT) - uses //github.com/kazuhikoarase/qrcode-generator (MIT) */
(function ($) {
'use strict';

File diff suppressed because one or more lines are too long

@ -20,38 +20,10 @@ module.exports = function (make) {
make.defaults('release');
make.before(function () {
var moment = make.moment();
make.env = {
pkg: pkg,
stamp: moment.format('YYYY-MM-DD HH:mm:ss')
};
$.info({ method: 'before', message: pkg.version + ' ' + make.env.stamp });
});
make.target('check-version', [], 'add git info to dev builds').async(function (done, fail) {
if (!/\+$/.test(pkg.version)) {
done();
return;
}
$.git(root, function (err, result) {
pkg.version += result.buildSuffix;
$.info({ method: 'check-version', message: 'version set to ' + pkg.version });
done();
});
});
make.target('clean', [], 'delete build folder').sync(function () {
$.DELETE(build);
$.DELETE(dist);
});
@ -83,11 +55,15 @@ module.exports = function (make) {
});
make.target('build', ['check-version', 'clean'], 'build all files').sync(function () {
make.target('build', ['clean', 'lint'], 'build all files').sync(function () {
var env = {
pkg: pkg
};
$(src + ': jquery.qrcode.js')
.includify()
.handlebars(make.env)
.handlebars(env)
.WRITE($.map.p(src, dist))
.WRITE($.map.p(src, build).s('.js', '-' + pkg.version + '.js'))
.uglifyjs()
@ -95,11 +71,11 @@ module.exports = function (make) {
.WRITE($.map.p(src, build).s('.js', '-' + pkg.version + '.min.js'));
$(src + ': **, ! *.js')
.handlebars(make.env)
.handlebars(env)
.WRITE($.map.p(src, build));
$(root + ': README*, LICENSE*')
.handlebars(make.env)
$(root + ': *.md')
.handlebars(env)
.WRITE($.map.p(root, build));
});

@ -1,10 +1,11 @@
{
"name": "jquery.qrcode",
"displayName": "jQuery.qrcode",
"version": "0.8.0+",
"version": "0.9.0",
"description": "generate QR codes dynamically",
"url": "http://larsjung.de/qrcode/",
"author": "Lars Jung",
"homepage": "http://larsjung.de/qrcode/",
"bugs": "https://github.com/lrsjng/jQuery.qrcode/issues",
"author": "Lars Jung <lrsjng@gmail.com> (http://larsjung.de)",
"license": "MIT",
"repository": {
"type": "git",

@ -1,7 +1,4 @@
/*! {{pkg.displayName}} {{pkg.version}} - //larsjung.de/qrcode - MIT License */
// Uses [QR Code Generator](http://www.d-project.com/qrcode/index.html) (MIT), appended to the end of this file.
// Kudos to [jquery.qrcode.js](http://github.com/jeromeetienne/jquery-qrcode) (MIT).
/*! {{pkg.displayName}} {{pkg.version}} - //larsjung.de/qrcode (MIT) - uses //github.com/kazuhikoarase/qrcode-generator (MIT) */
(function ($) {
'use strict';

Loading…
Cancel
Save