Merge branch 'develop'

Author: pkempenaers

.editorconfig

@@ -1,8 +1,8 @@
-# http://editorconfig.org
+# http://editorconfig.org
 root = true
 
 [*]
-indent_style = space
+indent_style = tab
 indent_size = 2
 end_of_line = crlf
 charset = utf-8

.eslintrc

@@ -1,4 +1,4 @@
-{
+{
  "extends": "airbnb",
  "plugins": ["angular"],
  "env": {
@@ -18,6 +18,6 @@
 "linebreak-style": "off",
 "no-tabs": "off",
 "no-mixed-spaces-and-tabs": "error",
-"indent": ["error", "tab"]
+"indent": ["error", "tab", { "SwitchCase": 1 }]
 }
 }

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

@@ -1,10 +1,13 @@
-<button class="dropdown-toggle btn btn-default"
+<button class="dropdown-toggle btn btn-default"
 ng-click="$ctrl.toggleDropdown()"
 ng-keydown="$ctrl.dropdownToggleKeyDown($event)">
-<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 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>
 </span>
+<span ng-class="$ctrl.settings.dropdownToggleIconClass"></span>
 </button>

src/app/component/dropdownTree.controller.js

@@ -1,4 +1,4 @@
-export default class DropDownTreeController {
+export default class DropDownTreeController {
 constructor(
 $log,
 $document,
@@ -53,6 +53,9 @@ export default class DropDownTreeController {
 'glyphicon',
 'glyphicon-file',
 ],
+dropdownToggleIconClass: [
+'caret',
+],
 appendToElement: this.$element.children(),
 };
 
@@ -159,47 +162,47 @@ export default class DropDownTreeController {
 
 dropdownToggleKeyDown(event) {
 switch (event.key) {
-case 'ArrowDown':
-if (this.open) {
-this.focusFirst();
-event.preventDefault();
-}
-break;
-default:
-this.catchKeydown(event);
+case 'ArrowDown':
+if (this.open) {
+this.focusFirst();
+event.preventDefault();
+}
+break;
+default:
+this.catchKeydown(event);
 }
 }
 
 searchKeydown(event) {
 switch (event.key) {
-case 'ArrowDown':
-this.focusNext();
-event.preventDefault();
-break;
-case 'ArrowUp':
-this.focusSelf();
-event.preventDefault();
-break;
-case 'Enter':
-this.selectAllVisible();
-event.preventDefault();
-break;
-default:
-this.catchKeydown(event);
+case 'ArrowDown':
+this.focusNext();
+event.preventDefault();
+break;
+case 'ArrowUp':
+this.focusSelf();
+event.preventDefault();
+break;
+case 'Enter':
+this.selectAllVisible();
+event.preventDefault();
+break;
+default:
+this.catchKeydown(event);
 }
 }
 
 catchKeydown(event) {
 switch (event.key) {
-case 'Escape':
-if (this.open) {
-this.toggleDropdown();
-this.focusSelf();
-event.preventDefault();
-}
-break;
-default:
-break;
+case 'Escape':
+if (this.open) {
+this.toggleDropdown();
+this.focusSelf();
+event.preventDefault();
+}
+break;
+default:
+break;
 }
 }
 

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

@@ -1,4 +1,4 @@
-export default class OptionRow {
+export default class OptionRow {
 constructor(
 dropdownTreeService,
 ) {
@@ -40,23 +40,23 @@ export default class OptionRow {
 
 keyDown(event) {
 switch (event.key) {
-case 'Enter':
-if (!this.isFolder() || this.settings.folderSelectable) {
-this.innerClicked(this.option);
+case 'Enter':
+if (!this.isFolder() || this.settings.folderSelectable) {
+this.innerClicked(this.option);
+event.preventDefault();
+}
+break;
+case 'ArrowDown':
+this.focusNext();
 event.preventDefault();
-}
-break;
-case 'ArrowDown':
-this.focusNext();
-event.preventDefault();
-break;
-case 'ArrowUp':
-this.focusPrevious();
-event.preventDefault();
-break;
-default:
-this.catchKeydown({ event });
-break;
+break;
+case 'ArrowUp':
+this.focusPrevious();
+event.preventDefault();
+break;
+default:
+this.catchKeydown({ event });
+break;
 }
 }
 }

src/app/main/main.template.html

@@ -1,4 +1,4 @@
-<header>
+<header>
 <div class="container">
 <a href="https://github.com/pkempenaers/angularjs-dropdown-tree" class="btn btn-info pull-right gh-button-link">
 <strong>
@@ -214,6 +214,12 @@ <h3>Settings</h3>
 <td>string or array of strings</td>
 <td>Class of the span before the name of an option when the option is not a folder</td>
 </tr>
+<tr>
+<td>dropdownToggleIconClass</td>
+<td>['caret']</td>
+<td>string or array of strings</td>
+<td>Class of caret icon in the dropdown-toggle</td>
+</tr>
 <tr>
 <td>closeOnBlur</td>
 <td>true</td>