Merge branch 'develop'

Author: Marc Brüderlin

LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2016 Marc Brüderlin
+Copyright © 2017 Marc Brüderlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the “Software”), to deal
@@ -16,4 +16,4 @@ 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.

README.md

@@ -10,7 +10,7 @@ particles.js is a lightweight, dependency-free and responsive javascript plugin
 There are several ways to install particles.js:
 - [Download the latest version](https://github.com/marcbruederlin/particles.js/archive/master.zip)
 - Install with npm: `npm install particlesjs --save`
-- Use the CDN: `https://npmcdn.com/particlesjs@2.0.1/dist/particles.min.js`
+- Use the CDN: `https://npmcdn.com/particlesjs@2.0.2/dist/particles.min.js`
 
 ## Usage
 Include the minified JS in your HTML (right before the closing body tag).

dist/particles.js

@@ -2,7 +2,7 @@
  * A lightweight, dependency-free and responsive javascript plugin for particle backgrounds.
  * 
  * @author Marc Bruederlin <hello@marcbruederlin.com>
- * @version 2.0.1
+ * @version 2.0.2
  * @license MIT
  * @see https://github.com/marcbruederlin/particles.js
  */
@@ -28,7 +28,7 @@ var Particles = (function(window, document) {
         maxParticles: 100,
         sizeVariations: 3,
         speed: 0.5,
-        color: _._hex2rgb('#000000'),
+        color: '#000000',
         minDistance: 120,
         connectParticles: false
       };
@@ -55,8 +55,8 @@ var Particles = (function(window, document) {
   Plugin.prototype.init = function(settings) {
     var _ = this;
 
-    settings.color = _._hex2rgb(settings.color);
     _.options = _._extend(_.defaults, settings);
+    _.options.color = ((settings.color) ? _._hex2rgb(settings.color) : _._hex2rgb(_.defaults.color));
     _.originalSettings = JSON.parse(JSON.stringify(_.options));
 
     _._initializeCanvas();

dist/particles.min.js

@@ -1,6 +1,6 @@
 {
   "name": "particlesjs",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A lightweight, dependency-free and responsive javascript plugin for particle backgrounds.",
   "main": "dist/particles.min.js",
   "repository": {

package.json

@@ -2,7 +2,7 @@
  * A lightweight, dependency-free and responsive javascript plugin for particle backgrounds.
  * 
  * @author Marc Bruederlin <hello@marcbruederlin.com>
- * @version 2.0.1
+ * @version 2.0.2
  * @license MIT
  * @see https://github.com/marcbruederlin/particles.js
  */
@@ -28,7 +28,7 @@ var Particles = (function(window, document) {
         maxParticles: 100,
         sizeVariations: 3,
         speed: 0.5,
-        color: _._hex2rgb('#000000'),
+        color: '#000000',
         minDistance: 120,
         connectParticles: false
       };
@@ -55,8 +55,8 @@ var Particles = (function(window, document) {
   Plugin.prototype.init = function(settings) {
     var _ = this;
 
-    settings.color = _._hex2rgb(settings.color);
     _.options = _._extend(_.defaults, settings);
+    _.options.color = ((settings.color) ? _._hex2rgb(settings.color) : _._hex2rgb(_.defaults.color));
     _.originalSettings = JSON.parse(JSON.stringify(_.options));
 
     _._initializeCanvas();