diff --git a/.eslintrc.json b/.eslintrc.json
index 33ca4f3..c7c2dad 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,5 @@
{
- "extends": "skelp/v3/es6",
+ "extends": "notninja/es6",
"env": {
"browser": true,
"node": true
@@ -19,8 +19,6 @@
{
"args": "none"
}
- ],
- "prefer-reflect": "off",
- "sort-keys": "off"
+ ]
}
}
diff --git a/.travis.yml b/.travis.yml
index ceaef54..261c239 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
language: node_js
node_js:
- "0.10"
diff --git a/CHANGES.md b/CHANGES.md
index 5bf3ef3..55b5aef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+## Version 2.3.0, 2017.05.31
+
+* Enable setting of multiple properties at once resulting in a single re-render [#69](https://github.com/neocotic/qrious/issues/69)
+* Deferring or avoiding ImageRenderer [#71](https://github.com/neocotic/qrious/issues/71)
+* Switch to container-based Travis builds for faster boot times [#73](https://github.com/neocotic/qrious/issues/73)
+* Change code style to be more contributor-friendly [#75](https://github.com/neocotic/qrious/issues/75)
+* Improve download links in README [#76](https://github.com/neocotic/qrious/issues/76)
+
## Version 2.2.0, 2016.10.30
* Add `backgroundAlpha` and `foregroundAlpha` options to control transparency [#63](https://github.com/neocotic/qrious/issues/63)
diff --git a/Gruntfile.js b/Gruntfile.js
index 05a3342..7d26356 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,6 +1,6 @@
/*
* QRious
- * Copyright (C) 2016 Alasdair Mercer
+ * Copyright (C) 2017 Alasdair Mercer
* Copyright (C) 2010 Tom Zerucha
*
* This program is free software: you can redistribute it and/or modify
@@ -17,12 +17,14 @@
* along with this program. If not, see .
*/
+'use strict';
+
module.exports = function(grunt) {
- var babel
- var commonjs
- var nodeResolve
- var semver = require('semver')
- var uglify
+ var babel;
+ var commonjs;
+ var nodeResolve;
+ var semver = require('semver');
+ var uglify;
var bannerLarge = [
'/*',
@@ -43,12 +45,12 @@ module.exports = function(grunt) {
' * You should have received a copy of the GNU General Public License',
' * along with this program. If not, see .',
' */'
- ].join('\n')
+ ].join('\n');
var bannerSmall = [
'/*! QRious v<%= pkg.version %> | (C) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %> | GPL v3 License',
'Based on jsqrencode | (C) 2010 tz@execpc.com | GPL v3 License',
'*/'
- ].join('\n')
+ ].join('\n');
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
@@ -59,19 +61,19 @@ module.exports = function(grunt) {
tasks: [ 'test' ]
}
}
- })
+ });
- var buildTasks = [ 'compile' ]
- var compileTasks = []
- var testTasks = [ 'compile' ]
+ var buildTasks = [ 'compile' ];
+ var compileTasks = [];
+ var testTasks = [ 'compile' ];
if (semver.satisfies(process.version, '>=0.12')) {
- babel = require('rollup-plugin-babel')
- commonjs = require('rollup-plugin-commonjs')
- nodeResolve = require('rollup-plugin-node-resolve')
- uglify = require('rollup-plugin-uglify')
+ babel = require('rollup-plugin-babel');
+ commonjs = require('rollup-plugin-commonjs');
+ nodeResolve = require('rollup-plugin-node-resolve');
+ uglify = require('rollup-plugin-uglify');
- compileTasks.push('clean', 'rollup')
+ compileTasks.push('clean', 'rollup');
grunt.config.merge({
clean: {
@@ -90,15 +92,14 @@ module.exports = function(grunt) {
return [
nodeResolve({
jsnext: true,
- main: true,
- skip: [ 'canvas' ]
+ main: true
}),
commonjs(),
babel({
exclude: [ 'node_modules/**' ],
runtimeHelpers: true
})
- ]
+ ];
}
},
files: {
@@ -124,7 +125,7 @@ module.exports = function(grunt) {
exclude: [ 'node_modules/**' ],
runtimeHelpers: true
})
- ]
+ ];
}
},
files: {
@@ -153,11 +154,11 @@ module.exports = function(grunt) {
uglify({
output: {
comments: function(node, comment) {
- return comment.type === 'comment2' && /^\!/.test(comment.value)
+ return comment.type === 'comment2' && /^\!/.test(comment.value);
}
}
})
- ]
+ ];
}
},
files: {
@@ -165,30 +166,30 @@ module.exports = function(grunt) {
}
}
}
- })
+ });
- grunt.loadNpmTasks('grunt-contrib-clean')
- grunt.loadNpmTasks('grunt-rollup')
+ grunt.loadNpmTasks('grunt-contrib-clean');
+ grunt.loadNpmTasks('grunt-rollup');
} else {
- grunt.log.writeln('"clean" and "rollup" tasks are disabled because Node.js version is <0.12! Please consider upgrading Node.js...')
+ grunt.log.writeln('"clean" and "rollup" tasks are disabled because Node.js version is <0.12! Please consider upgrading Node.js...');
}
if (semver.satisfies(process.version, '>=4')) {
- compileTasks.unshift('eslint')
+ compileTasks.unshift('eslint');
grunt.config.set('eslint', {
target: [ 'src/**/*.js' ]
- })
+ });
- grunt.loadNpmTasks('grunt-eslint')
+ grunt.loadNpmTasks('grunt-eslint');
} else {
- grunt.log.writeln('"eslint" task is disabled because Node.js version is <4! Please consider upgrading Node.js...')
+ grunt.log.writeln('"eslint" task is disabled because Node.js version is <4! Please consider upgrading Node.js...');
}
- grunt.loadNpmTasks('grunt-contrib-watch')
+ grunt.loadNpmTasks('grunt-contrib-watch');
- grunt.registerTask('default', [ 'build' ])
- grunt.registerTask('build', buildTasks)
- grunt.registerTask('compile', compileTasks)
- grunt.registerTask('test', testTasks)
-}
+ grunt.registerTask('default', [ 'build' ]);
+ grunt.registerTask('build', buildTasks);
+ grunt.registerTask('compile', compileTasks);
+ grunt.registerTask('test', testTasks);
+};
diff --git a/LICENSE.md b/LICENSE.md
index 7ac3863..c275508 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,5 +1,5 @@
QRious
-Copyright (C) 2016 Alasdair Mercer
+Copyright (C) 2017 Alasdair Mercer
Copyright (C) 2010 Tom Zerucha
This program is free software: you can redistribute it and/or modify
diff --git a/README.md b/README.md
index 416b95b..eed4b68 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@
[QRious](https://github.com/neocotic/qrious) is a pure JavaScript library for generating QR codes using HTML5 canvas.
[![Chat](https://img.shields.io/gitter/room/neocotic/qrious.svg?style=flat-square)](https://gitter.im/neocotic/qrious)
-[![Build](https://img.shields.io/travis/neocotic/qrious/develop.svg?style=flat-square)](https://travis-ci.org/neocotic/qrious)
-[![Dependency Status](https://img.shields.io/david/neocotic/qrious.svg?style=flat-square)](https://david-dm.org/neocotic/qrious)
-[![Dev Dependency Status](https://img.shields.io/david/dev/neocotic/qrious.svg?style=flat-square)](https://david-dm.org/neocotic/qrious#info=devDependencies)
+[![Build Status](https://img.shields.io/travis/neocotic/qrious/develop.svg?style=flat-square)](https://travis-ci.org/neocotic/qrious)
+[![Optional Dependency Status](https://img.shields.io/david/optional/neocotic/qrious.svg?style=flat-square)](https://david-dm.org/neocotic/qrious?type=optional)
+[![Dev Dependency Status](https://img.shields.io/david/dev/neocotic/qrious.svg?style=flat-square)](https://david-dm.org/neocotic/qrious?type=dev)
[![License](https://img.shields.io/npm/l/qrious.svg?style=flat-square)](https://github.com/neocotic/qrious/blob/master/LICENSE.md)
[![Release](https://img.shields.io/npm/v/qrious.svg?style=flat-square)](https://www.npmjs.com/package/qrious)
@@ -38,8 +38,8 @@ you want to install that way instead of using `npm`.
If you want to simply download the file to be used in the browser you can find them below:
-* [Development Version](https://github.com/neocotic/qrious/blob/master/dist/umd/qrious.js)
-* [Production Version](https://github.com/neocotic/qrious/blob/master/dist/umd/qrious.min.js)
+* [Development Version](https://cdn.rawgit.com/neocotic/qrious/master/dist/umd/qrious.js) (123kb - [Source Map](https://cdn.rawgit.com/neocotic/qrious/master/dist/umd/qrious.js.map))
+* [Production Version](https://cdn.rawgit.com/neocotic/qrious/master/dist/umd/qrious.min.js) (37kb - [Source Map](https://cdn.rawgit.com/neocotic/qrious/master/dist/umd/qrious.min.js.map))
### Node.js Dependencies
@@ -75,8 +75,8 @@ In the browser:
const qr = new QRious({
element: document.getElementById('qr'),
value: 'https://github.com/neocotic/qrious'
- })
- })()
+ });
+ })();