Remove recursion. Update demo

Author: dramoturg

src/js/colorpicker.js

@@ -126,32 +126,33 @@ var Colorpicker = (function(DX, window, document, undefined) {
 
 		function getGroups(colors) {
 
-			var groups = [];
-
-			if (!colors || colors.length === 0) {
-				colorList = defaults.colorList;
-				groups.push(createGroup(colorList));
-			} else {
-				var colorsWithoutGroup = [];
-
-				colors.forEach(function(item) {
-					if (isObject(item) || isString(item)) {
-						var isItGroup = Array.isArray(item.colors);
-						if (isItGroup) {
-							groups.push(item);
-						} else {
-							colorsWithoutGroup.push(item);
-						}
+			colors = colors  || [];
+
+			var groups = [],
+				colorsWithoutGroup = [];
+
+			colors.forEach(function(item) {
+				if (isObject(item) || isString(item)) {
+					var isItGroup = Array.isArray(item.colors);
+					if (isItGroup) {
+						groups.push(item);
+					} else {
+						colorsWithoutGroup.push(item);
 					}
-				});
+				}
+			});
 
-				groups.unshift(
-					createGroup(colorsWithoutGroup)
-				);
+			groups.unshift(
+				createGroup(colorsWithoutGroup)
+			);
 
-			}
+			groups = removeEmptyGroups(groups);
 
-			return removeEmptyGroups(groups);
+			if (!groups.length) {
+				colorList = defaults.colorList;
+				groups.push(createGroup(colorList));
+			}
+			return groups;
 		}
 
 		/**
@@ -187,13 +188,9 @@ var Colorpicker = (function(DX, window, document, undefined) {
 			});
 			allColors = getAllColorsFromGroups(groups);
 
-			if (!allColors.length) {
-				setColorList(defaults.colorList);
-			} else {
-				var dataForDropDown = prepareDataForDropDown(groups);
-				dropDown.setDataList(dataForDropDown);
-				setColor(allColors[0]);
-			}
+			var dataForDropDown = prepareDataForDropDown(groups);
+			dropDown.setDataList(dataForDropDown);
+			setColor(allColors[0]);
 
 		}
 

test/html/default.case.html

@@ -23,9 +23,30 @@
 	<script>
 
 		Colorpicker.colorList = [
+			['#dasdasd','#dsadasd'],
+			'#FFFFFF', '#e5e5e5', '#cccccc', '#b5b5b5', '#999999', '#828282',
+			'#666666', '#4f4f4f', '#333333', '#1c1c1c', '#161412',
 			{
-				groupTitle: 'test',
-				colors: []
+				groupTitle: 'Basic and Studies',
+				colors: [
+					'#962d3e','#d9372c','#de7d2c','#ffc973','#d9d96c','#60994d',
+					'#79bd8f','#00b892','#348899','#14a0b3','#92c4e0'
+				]
+			},
+			'#ff6666','#ffaf66','#fffb66','#b8ff66','#66ff66','#66ffaf',
+			'#66fffb','#66beff','#6666ff','#bc66ff','#fb66ff',
+			{
+				groupTitle: 'Common',
+				colors: [
+					'#ff9999','#ffc799','#fffa99','#d3ff99','#99ff99','#66ffaf',
+					'#99fffa','#99d8ff','#9999ff','#cd99ff','#fa99ff',
+					'#ff6666','#ffaf66','#fffb66','#b8ff66','#66ff66','#66ffaf',
+					'#66fffb','#66beff','#6666ff','#bc66ff','#fb66ff',
+					'#cc2929','#cc7229','#ccc429','#85cc29','#29cc29','#29cc72',
+					'#29ccc4','#298ecc','#5e5ee5','#8b54cc','#c429cc',
+					'#a50000','#a54300','#998e00','#5a9900','#009900','#009941',
+					'#00998e','#006699','#4646af','#5f3c96','#8e0099'
+				]
 			}
 		];
 	</script>
@@ -38,14 +59,14 @@
 				{
 					groupTitle: 'Group 1',
 					colors: [
-						'#ffffff', '#e5e5e5', '#cccccc', '#b5b5b5', '#999999', '#828282'
+						'#00998e','#006699','#4646af','#5f3c96','#8e0099'
 					]
 				}
 			];
 			inputColorPickerGroupWithoutTitle.colorList = [
 				{
 					colors: [
-						'#ffffff', '#e5e5e5', '#cccccc', '#b5b5b5', '#999999', '#828282'
+						'#cc2929','#cc7229','#ccc429','#85cc29','#29cc29','#29cc72',
 					]
 				}
 			];