Merge branch 'develop'

Author: pkempenaers

src/app/component/dropdownTree.controller.js

@@ -151,20 +151,22 @@
 	}
 
 	optionClicked(option) {
-		const indexOfOption = this.selectedOptions.indexOf(option);
-		if (indexOfOption >= 0) {
-			this.selectedOptions.splice(indexOfOption, 1);
-		} else {
-			if (this.settings.selectionLimit > 0) {
-				if (this.settings.selectionLimit === this.selectedOptions.length) {
-					if (this.settings.removeFromFront) {
-						this.selectedOptions.splice(0, 1);
-					} else {
-						this.selectedOptions.splice(this.selectedOptions.length - 1, 1);
+		if (this.dropdownTreeService.isSelectAble(option, this.settings)) {
+			const indexOfOption = this.selectedOptions.indexOf(option);
+			if (indexOfOption >= 0) {
+				this.selectedOptions.splice(indexOfOption, 1);
+			} else {
+				if (this.settings.selectionLimit > 0) {
+					if (this.settings.selectionLimit === this.selectedOptions.length) {
+						if (this.settings.removeFromFront) {
+							this.selectedOptions.splice(0, 1);
+						} else {
+							this.selectedOptions.splice(this.selectedOptions.length - 1, 1);
+						}
 					}
 				}
+				this.selectedOptions.push(option);
 			}
-			this.selectedOptions.push(option);
 		}
 		this.emitSelection();
 	}

src/app/component/dropdownTree.service.js

@@ -39,6 +39,55 @@ export default class DropdownTreeService {
 		return undefined;
 	}
 
+	selectAllChildOptions(option, settings, currentSelection) {
+		const optionsToAdd = this.getOptionsToAdd(option, settings, currentSelection);
+
+		if (optionsToAdd.length === 0) {
+			this.removeAllChildOptions(option, settings, currentSelection);
+			return true;
+		}
+		if (settings.selectionLimit === 0) {
+			optionsToAdd.forEach((optionToAdd) => {
+				currentSelection.push(optionToAdd);
+			});
+			return true;
+		}
+		if (optionsToAdd.length + currentSelection.length <= settings.selectionLimit) {
+			optionsToAdd.forEach((optionToAdd) => {
+				currentSelection.push(optionToAdd);
+			});
+			return true;
+		}
+
+		return false;
+	}
+
+	getOptionsToAdd(option, settings, currentSelection) {
+		let optionsToAdd = [];
+		if (this.isFolder(option, settings)) {
+			this.getChildOptions(option, settings)
+				.forEach((childOption) => {
+					optionsToAdd = optionsToAdd.concat(
+						this.getOptionsToAdd(childOption, settings, currentSelection, false),
+					);
+				});
+		} else if (currentSelection.indexOf(option) < 0) {
+			optionsToAdd.push(option);
+		}
+
+		return optionsToAdd;
+	}
+
+	removeAllChildOptions(option, settings, currentSelection) {
+		if (this.isFolder(option, settings)) {
+			this.getChildOptions(option, settings).forEach((childOption) => {
+				this.removeAllChildOptions(childOption, settings, currentSelection);
+			});
+		} else if (currentSelection.indexOf(option) >= 0) {
+			currentSelection.splice(currentSelection.indexOf(option), 1);
+		}
+	}
+
 	isVisible(option, settings, searchText) {
 		if (this.isFolder(option, settings) &&
 			!this.isVisibleItem(option, settings, searchText)) {
@@ -102,4 +151,11 @@ export default class DropdownTreeService {
 		}
 		return !collection.some(option => compareCollection.indexOf(option) < 0);
 	}
+
+	isSelectAble(option, settings) {
+		if (!this.isFolder(option, settings)) {
+			return true;
+		}
+		return settings.folderSelectable;
+	}
 }

src/app/component/option-row/option-row.controller.js

@@ -37,6 +37,19 @@
 		this.optionClicked({ option });
 	}
 
+	selectAllChilds() {
+		const selectionChanged =
+			this.dropdownTreeService.selectAllChildOptions(
+				this.option,
+				this.settings,
+				this.selectedOptions,
+				true,
+			);
+		if (selectionChanged) {
+			this.optionClicked({ option: this.option });
+		}
+	}
+
 	isSelected() {
 		return this.selectedOptions.indexOf(this.option) >= 0;
 	}

src/app/component/option-row/option-row.template.html

@@ -15,7 +15,7 @@
 			<span ng-if="!$ctrl.isFolder()"
 						ng-class="$ctrl.settings.childClass"></span>
 			<span tabindex="-1" 
-					 ng-click="(!$ctrl.isFolder() || $ctrl.settings.folderSelectable) && $ctrl.innerClicked($ctrl.option)"
+					 ng-click="((!$ctrl.isFolder() || $ctrl.settings.folderSelectable) && $ctrl.innerClicked($ctrl.option)) || ($ctrl.isFolder() && !$ctrl.settings.folderSelectable && $ctrl.selectAllChilds())"
 					 ng-keydown="$ctrl.keyDown($event)"
 					 class="focusable">
 				{{$ctrl.getDisplayText()}}