Merge with default

Author: Pieter Wigboldus

gulp/scripts.js

@@ -26,13 +26,7 @@ function scripts() {
             .on('end', utilities.logBegin('Scripts'))
             .pipe(utilities.initSourceMaps())
             .pipe(concat(task.filename))
-            .pipe(
-                uglify(packageOptions.uglify).on('error', function(error) {
-                    var stream = this;
-
-                    utilities.onError(stream, error, error.cause.message, error.cause.filename);
-                })
-            )
+            .pipe(uglify())
             .pipe(utilities.writeSourceMaps())
             .on('end', utilities.logEnd(task))
             .pipe(gulp.dest(task.saveto));

js/charts.core.js

@@ -9,7 +9,7 @@
 window.Chart = (function(element, config) {
     'use strict';
 
-    var version = '2.1.0';
+    var version = '2.2.1';
 
     var highchart;