fix: add clear all text Input (#155)

closes #153
ng-select · Dec 5, 2017 · 8609fe5 · 8609fe5
1 parent 1e4d521
commit 8609fe5
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,9 @@ addons:
     packages:
     - google-chrome-stable
 before_install:
+- echo "$TRAVIS_BRANCH"
+- echo "$TRAVIS_PULL_REQUEST"
+- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then openssl aes-256-cbc -K $encrypted_100b62b33cf9_key -iv $encrypted_100b62b33cf9_iv -in travis_rsa.enc -out travis_rsa -d; fi
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 - export CHROME_BIN=chromium-browser
@@ -25,6 +28,7 @@ script:
 - npm run-script coveralls
 - yarn run integration
 - yarn run build:demo
+- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then node_modules/.bin/gh-pages-travis; fi
 
 env:
   global:

diff --git a/README.md b/README.md
@@ -104,6 +104,7 @@ map: {
 | placeholder | string | `-` | no | Placeholder text. |
 | notFoundText | string | `No items found` | no | Set custom text when filter returns empty result |
 | typeToSearchText | string | `Type to search` | no | Set custom text when using Typeahead |
+| clearAllText | string | `Clear all` | no | Set custom text for clear all icon title |
 | addTagText | string | `Add item` | no | Set custom text when using tagging |
 | [typeahead] | Subject |  `-` | no | Custom autocomplete or filter. |
 | [disableVirtualScroll] | boolean |  false | no | Disable virtual scroll |

diff --git a/demo/app/examples/reactive-forms.component.ts b/demo/app/examples/reactive-forms.component.ts
@@ -63,6 +63,7 @@ import { DataService } from '../shared/data.service';
                            bindValue="id"
                            [multiple]="true"
                            placeholder="Select cities"
+                           clearAllText="Clear"
                            formControlName="selectedCitiesIds">
                 </ng-select>
                 ---

diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
     "reflect-metadata": "^0.1.10",
     "remap-istanbul": "^0.6.4",
     "rimraf": "^2.6.1",
-    "rxjs": "^5.4.3",
+    "rxjs": "^5.5.3",
     "sass-loader": "^6.0.1",
     "standard-version": "^4.2.0",
     "style-loader": "^0.13.0",

diff --git a/src/ng-select/ng-select.component.html b/src/ng-select/ng-select.component.html
@@ -29,7 +29,7 @@
 
     <spinner class="ng-spinner-zone" *ngIf="isLoading"></spinner>
 
-    <span *ngIf="showClear()" (click)="handleClearClick($event)" class="ng-clear-zone" title="Clear all" aria-label="Clear all">
+    <span *ngIf="showClear()" (click)="handleClearClick($event)" class="ng-clear-zone" title="{{clearAllText}}">
         <span class="ng-clear" aria-hidden="true">×</span>
     </span>
 

diff --git a/src/ng-select/ng-select.component.ts b/src/ng-select/ng-select.component.ts
@@ -71,6 +71,7 @@ export class NgSelectComponent implements OnInit, OnDestroy, OnChanges, AfterVie
     @Input() typeToSearchText;
     @Input() addTagText;
     @Input() loadingText;
+    @Input() clearAllText;
     @Input() dropdownPosition: 'below' | 'above' = 'below';
 
     @Input()
@@ -621,6 +622,7 @@ export class NgSelectComponent implements OnInit, OnDestroy, OnChanges, AfterVie
         this.typeToSearchText = this.typeToSearchText || config.typeToSearchText;
         this.addTagText = this.addTagText || config.addTagText;
         this.loadingText = this.loadingText || config.loadingText;
+        this.clearAllText = this.clearAllText || config.clearAllText;
         this.disableVirtualScroll = this.disableVirtualScroll || config.disableVirtualScroll;
     }
 }
diff --git a/src/ng-select/ng-select.types.ts b/src/ng-select/ng-select.types.ts
@@ -23,5 +23,6 @@ export class NgSelectConfig {
     typeToSearchText? = 'Type to search';
     addTagText? = 'Add item';
     loadingText? = 'Loading...';
+    clearAllText = 'Clear all';
     disableVirtualScroll? = false;
 }
diff --git a/yarn.lock b/yarn.lock
@@ -5639,9 +5639,9 @@ rollup@^0.50.0:
   version "0.50.0"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.50.0.tgz#4c158f4e780e6cb33ff0dbfc184a52cc58cd5f3b"
 
-rxjs@^5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.3.tgz#0758cddee6033d68e0fd53676f0f3596ce3d483f"
+rxjs@^5.5.3:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.3.tgz#b62227e74b84f4e77bdf440e50b5ee01a1bc7dcd"
   dependencies:
     symbol-observable "^1.0.1"