Merge branch 'develop'

Author: pkempenaers

src/app/component/dropdown-toggle/dropdown-toggle.template.html

@@ -2,12 +2,7 @@
 ng-click="$ctrl.toggleDropdown()"
 ng-keydown="$ctrl.dropdownToggleKeyDown($event)">
 <span class="selection-text">
-<span ng-if="$ctrl.selectedOptions.length === 0">
-Select {{$ctrl.texts.optionNames}}
-</span>
-<span ng-if="$ctrl.selectedOptions.length > 0">
-{{$ctrl.selectedOptions.length}} {{$ctrl.texts.optionNames}} selected
-</span>
+{{$ctrl.getButtonText()}}
 </span>
 <span ng-class="$ctrl.settings.dropdownToggleIconClass"></span>
 </button>

src/app/component/dropdownTree.controller.js

@@ -78,6 +78,13 @@
 }
 }
 
+$doCheck() {
+if (angular.isDefined(this.externalSelection) &&
+!this.dropdownTreeService.areSameSelections(this.externalSelection, this.selectedOptions)) {
+this.selectedOptions = angular.extend([], this.externalSelection);
+}
+}
+
 toggleDropdown() {
 this.open = !this.open;
 if (this.open) {
@@ -239,4 +246,14 @@
 focusSelf() {
 this.$element.find('button')[0].focus();
 }
+
+getButtonText() {
+if (angular.isFunction(this.settings.getButtonText)) {
+return this.settings.getButtonText(this.selectedOptions, this.options);
+}
+if (this.selectedOptions.length === 0) {
+return `Select ${this.texts.optionNames}`;
+}
+return `${this.selectedOptions.length} ${this.texts.optionNames} selected`;
+}
 }

src/app/main/main.controller.js

@@ -1,4 +1,4 @@
-export default class MainController {
+export default class MainController {
 constructor($log) {
 'ngInject';
 
@@ -37,6 +37,12 @@ export default class MainController {
 disableSearch: false,
 closeOnBlur: true,
 folderSelectable: true,
+getButtonText(selection) {
+if (selection.length > 0) {
+return selection.map(v => v.name).join(', ');
+}
+return 'Select items';
+},
 };
 }
 

src/app/main/main.template.html

@@ -253,6 +253,14 @@ <h3>Settings</h3>
 be passed from where in the array an option should be removed (front/back)
 </td>
 </tr>
+<tr>
+<td>getButtonText</td>
+<td>undefined</td>
+<td>function</td>
+<td>
+Should return the string that you want to display in the dropdown toggle. Is called with as first argument the current selection and second argument the selection-array.
+</td>
+</tr>
 </tbody>
 </table>
 </div>