fix issue#28

NileshPatel17 · Apr 28, 2018 · 236c69b · 236c69b
1 parent 6068780
commit 236c69b
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 17 deletions.
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -7,20 +7,15 @@
     {
       "root": "src",
       "outDir": "dist",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
+      "assets": ["assets", "favicon.ico"],
       "index": "index.html",
       "main": "main.ts",
       "polyfills": "polyfills.ts",
       "test": "test.ts",
       "tsconfig": "tsconfig.app.json",
       "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.scss"
-      ],
+      "prefix": "ng",
+      "styles": ["styles.scss"],
       "scripts": [],
       "environmentSource": "environments/environment.ts",
       "environments": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-multiselect-dropdown",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": true,
   "description": "Angular Multi-Select Dropdown",
   "author": "Nilesh Patel",

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -3,8 +3,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 
 import { TabsModule, ButtonsModule } from 'ngx-bootstrap';
-// import { NgMultiSelectDropDownModule } from '../ng-multiselect-dropdown/src';
-import { NgMultiSelectDropDownModule } from 'ng-multiselect-dropdown';
+import { NgMultiSelectDropDownModule } from '../ng-multiselect-dropdown/src';
+// import { NgMultiSelectDropDownModule } from 'ng-multiselect-dropdown';
 
 import { SelectSectionComponent } from './components/select-section';
 import { SampleSectionComponent } from './components/sample-section.component';

diff --git a/src/app/components/select/multiple-demo.ts b/src/app/components/select/multiple-demo.ts
@@ -8,7 +8,7 @@ import { Component, OnInit } from '@angular/core';
 export class MultipleDemoComponent implements OnInit {
   myForm: FormGroup;
   disabled = false;
-  ShowFilter = false;
+  ShowFilter = true;
   showAll = true;
   limitSelection = false;
   cities: Array<any> = [];
@@ -119,7 +119,13 @@ export class MultipleDemoComponent implements OnInit {
 
   onItemSelect(item: any) {
     console.log('onItemSelect', item);
+    console.log('form model', this.myForm.get('city').value);
   }
+  onItemDeSelect(item: any) {
+    console.log('onItem DeSelect', item);
+    console.log('form model', this.myForm.get('city').value);
+  }
+
   onSelectAll(items: any) {
     console.log('onSelectAll', items);
   }

diff --git a/src/app/components/select/single-demo.ts b/src/app/components/select/single-demo.ts
@@ -73,6 +73,7 @@ export class SingleDemoComponent implements OnInit {
 
   onItemSelect(item: any) {
     console.log('onItemSelect', item);
+    console.log('selectedItem', this.selectedItem);
   }
 
   toggleCloseDropdownSelection() {

diff --git a/src/ng-multiselect-dropdown/src/multi-select.component.html b/src/ng-multiselect-dropdown/src/multi-select.component.html
@@ -1,7 +1,7 @@
 <div tabindex="=0" (blur)="onTouched()" class="multiselect-dropdown" (clickOutside)="closeDropdown()">
   <div [class.disabled]="disabled">
     <span tabindex="-1" class="dropdown-btn" (click)="toggleDropdown($event)">
-      <span *ngIf="selectedItems.length == 0">{{placeholder}}</span>
+      <span *ngIf="selectedItems.length == 0">{{_placeholder}}</span>
       <span class="selected-item" *ngFor="let item of selectedItems;trackBy: trackByFn;let k = index" [hidden]="k > _settings.itemsShowLimit-1">
         {{item.text}}
         <a style="padding-top:2px;padding-left:2px;color:white" (click)="onItemClick($event,item)">x</a>

diff --git a/src/ng-multiselect-dropdown/src/multiselect.component.ts b/src/ng-multiselect-dropdown/src/multiselect.component.ts
@@ -55,7 +55,7 @@ export class MultiSelectComponent implements ControlValueAccessor {
   public _data: Array<ListItem> = [];
   public selectedItems: Array<ListItem> = [];
   public isDropdownOpen = false;
-
+  _placeholder: string = 'Select';
   filter: ListItem = new ListItem(this.data);
   defaultSettings: DropdownSettings = {
     singleSelection: false,
@@ -72,7 +72,14 @@ export class MultiSelectComponent implements ControlValueAccessor {
     closeDropDownOnSelection: false
   };
 
-  @Input() placeholder = 'Select';
+  @Input()
+  public set placeholder(value: string) {
+    if (value) {
+      this._placeholder = value;
+    } else {
+      this._placeholder = 'Select';
+    }
+  }
   @Input() disabled = false;
 
   @Input()
@@ -236,7 +243,7 @@ export class MultiSelectComponent implements ControlValueAccessor {
     } else {
       this.selectedItems.push(item);
     }
-    // this.onChangeCallback(this.emittedValue(this.selectedItems));
+    this.onChangeCallback(this.emittedValue(this.selectedItems));
     this.onSelect.emit(this.emittedValue(item));
   }
 
@@ -246,7 +253,7 @@ export class MultiSelectComponent implements ControlValueAccessor {
         this.selectedItems.splice(this.selectedItems.indexOf(item), 1);
       }
     });
-    // this.onChangeCallback(this.emittedValue(this.selectedItems));
+    this.onChangeCallback(this.emittedValue(this.selectedItems));
     this.onDeSelect.emit(this.emittedValue(itemSel));
   }