Merge pull request #22 from AhmadShahid/master

add ES6 implementation of a shuffle function

dist/frappe-charts.min.cjs.js

@@ -550,6 +550,11 @@ function lightenDarkenColor(col, amt) {
 	return (usePound ? "#" : "") + (g | b << 8 | r << 16).toString(16);
 }
 
+/**
+ * Shuffles array in place. ES6 version
+ * @param {Array} a items An array containing the items.
+ */
+
 var SvgTip = function () {
 	function SvgTip(_ref) {
 		var _ref$parent = _ref.parent,
@@ -3230,6 +3235,14 @@ var Heatmap = function (_BaseChart) {
 	return Heatmap;
 }(BaseChart);
 
+// if ("development" !== 'production') {
+// 	// Enable LiveReload
+// 	document.write(
+// 		'<script src="http://' + (location.host || 'localhost').split(':')[0] +
+// 		':35729/livereload.js?snipver=1"></' + 'script>'
+// 	);
+// }
+
 var chartTypes = {
 	line: LineChart,
 	bar: BarChart,

dist/frappe-charts.min.esm.js

@@ -548,6 +548,11 @@ function lightenDarkenColor(col, amt) {
 	return (usePound ? "#" : "") + (g | b << 8 | r << 16).toString(16);
 }
 
+/**
+ * Shuffles array in place. ES6 version
+ * @param {Array} a items An array containing the items.
+ */
+
 var SvgTip = function () {
 	function SvgTip(_ref) {
 		var _ref$parent = _ref.parent,
@@ -3228,6 +3233,14 @@ var Heatmap = function (_BaseChart) {
 	return Heatmap;
 }(BaseChart);
 
+// if ("development" !== 'production') {
+// 	// Enable LiveReload
+// 	document.write(
+// 		'<script src="http://' + (location.host || 'localhost').split(':')[0] +
+// 		':35729/livereload.js?snipver=1"></' + 'script>'
+// 	);
+// }
+
 var chartTypes = {
 	line: LineChart,
 	bar: BarChart,

src/scripts/helpers/utils.js

@@ -30,24 +30,17 @@ export function lightenDarkenColor(col,amt) {
 	return (usePound?"#":"") + (g | (b << 8) | (r << 16)).toString(16);
 }
 
+/**
+ * Shuffles array in place. ES6 version
+ * @param {Array} a items An array containing the items.
+ */
 export function shuffle(array) {
-	// https://stackoverflow.com/a/2450976/6495043
 	// Awesomeness: https://bost.ocks.org/mike/shuffle/
+	// https://stackoverflow.com/a/2450976/6495043
+	// https://stackoverflow.com/questions/6274339/how-can-i-shuffle-an-array?noredirect=1&lq=1
 
-	var currentIndex = array.length, temporaryValue, randomIndex;
+	for (let i = array.length - 1; i > 0; i--) {
-
+		let j = Math.floor(Math.random() * (i + 1));
-	// While there remain elements to shuffle...
+		[array[i], array[j]] = [array[j], array[i]];
-	while (0 !== currentIndex) {
-
-		// Pick a remaining element...
-		randomIndex = Math.floor(Math.random() * currentIndex);
-		currentIndex -= 1;
-
-		// And swap it with the current element.
-		temporaryValue = array[currentIndex];
-		array[currentIndex] = array[randomIndex];
-		array[randomIndex] = temporaryValue;
 	}
-
+}
-	return array;
-}